diff --git a/pagure/__init__.py b/pagure/__init__.py
index c7c73db..153a89d 100644
--- a/pagure/__init__.py
+++ b/pagure/__init__.py
@@ -385,7 +385,8 @@ def __get_file_in_tree(repo_obj, tree, filepath, bail_on_tree=False):
     if isinstance(tree, pygit2.Blob):
         return
     for entry in tree:
-        if entry.name == filename:
+        fname = entry.name.decode('utf-8')
+        if fname == filename:
             if len(filepath) == 1:
                 blob = repo_obj.get(entry.id)
                 # If we can't get the content (for example: an empty folder)
diff --git a/pagure/ui/filters.py b/pagure/ui/filters.py
index 77c1247..a7a562d 100644
--- a/pagure/ui/filters.py
+++ b/pagure/ui/filters.py
@@ -413,7 +413,7 @@ def text_wraps(dictionary):
 
 @APP.template_filter('unicode')
 def convert_unicode(text):
-    if isinstance(text, basestring):
+    if isinstance(text, str):
         return text.decode("utf8")
     else:
         return text