From 09193f688eda1ee3b3844feb23cb7dd0b941c76e Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jul 14 2016 09:30:10 +0000
Subject: Adjust code for py2/py3 encoding differences


---

diff --git a/pagure/__init__.py b/pagure/__init__.py
index 3df745d..3bca7a8 100644
--- a/pagure/__init__.py
+++ b/pagure/__init__.py
@@ -450,7 +450,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 d343444..625257f 100644
--- a/pagure/ui/filters.py
+++ b/pagure/ui/filters.py
@@ -86,6 +86,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="%(cnt_lbl)s"></a></td>'
@@ -100,7 +102,7 @@ def format_loc(loc, commit=None, filename=None, tree_id=None, prequest=None,
                         'cnt': '%s_%s' % (index, cnt),
                         'cnt_lbl': cnt,
                         'img': flask.url_for('static', filename='users.png'),
-                        'filename': filename.decode('UTF-8'),
+                        'filename': filename,
                         'commit': commit,
                         'tree_id': tree_id,
                     }
@@ -420,7 +422,8 @@ def text_wraps(dictionary):
 
 @APP.template_filter('unicode')
 def convert_unicode(text):
-    if isinstance(text, str):
+
+    if isinstance(text, str) and six.PY2:
         return text.decode("utf8")
     else:
         return text