From b133919789bf750a14da0398ec3e54b57fe575a9 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Oct 21 2016 10:06:05 +0000
Subject: Adjust code for py2/py3 encoding differences


---

diff --git a/pagure/__init__.py b/pagure/__init__.py
index d189ac0..cb70ee2 100644
--- a/pagure/__init__.py
+++ b/pagure/__init__.py
@@ -533,7 +533,11 @@ def __get_file_in_tree(repo_obj, tree, filepath, bail_on_tree=False):
     if isinstance(tree, pygit2.Blob):
         return
     for entry in tree:
-        fname = entry.name.decode('utf-8')
+
+        fname = entry.name
+        if six.PY2:
+            fname = entry.name.decode('utf-8')
+
         if fname == filename:
             if len(filepath) == 1:
                 blob = repo_obj.get(entry.id)
diff --git a/pagure/ui/filters.py b/pagure/ui/filters.py
index 208c912..4b11107 100644
--- a/pagure/ui/filters.py
+++ b/pagure/ui/filters.py
@@ -99,6 +99,8 @@ def format_loc(loc, commit=None, filename=None, tree_id=None, prequest=None,
         if line == '</pre></div>':
             break
         if filename and commit:
+            if isinstance(filename, str) and six.PY2:
+                filename = filename.decode('UTF-8')
             output.append(
                 '<tr id="c-%(commit)s-%(cnt_lbl)s"><td class="cell1">'
                 '<a id="%(cnt)s" href="#%(cnt)s" data-line-number='
@@ -114,7 +116,7 @@ def format_loc(loc, commit=None, filename=None, tree_id=None, prequest=None,
                     {
                         'cnt': '%s_%s' % (index, cnt),
                         'cnt_lbl': cnt,
-                        'filename': filename.decode('UTF-8'),
+                        'filename': filename,
                         'commit': commit,
                         'tree_id': tree_id,
                     }
@@ -463,7 +465,8 @@ def convert_unicode(text):
     ''' If the provided string is a binary string, this filter converts it
     to UTF-8 (unicode).
     '''
-    if isinstance(text, str):
+
+    if isinstance(text, str) and six.PY2:
         return text.decode("utf8")
     else:
         return text