python3: removed more unicode usage

rhodecode/apps/admin/tests/test_admin_settings.py

@@ -237,7 +237,7 b' class TestAdminSettingsGlobal(object):'
         app_settings = SettingsModel().get_all_settings()
         del settings['csrf_token']
         for key, value in settings.items():
-            assert app_settings[key] == value.decode('utf-8')
+            assert app_settings[key] == value
 
         return response
 

rhodecode/apps/admin/views/settings.py

@@ -442,7 +442,7 b' class AdminSettingsView(BaseAppView):'
             'repo_group/test_repo1', error_container=error_container)
         if error_container:
             def converter(inp):
-                return h.html_escape(unicode(inp))
+                return h.html_escape(inp)
 
             return 'ERRORS: ' + '\n'.join(map(converter, error_container))
 

rhodecode/config/settings_maker.py

@@ -81,8 +81,6 b' class SettingsMaker(object):'
 
     @classmethod
     def _bool_func(cls, input_val):
-        if isinstance(input_val, str):
-            input_val = input_val.encode('utf8')
         return str2bool(input_val)
 
     @classmethod

rhodecode/lib/_vendor/authomatic/adapters.py

@@ -273,7 +273,7 b' class WerkzeugAdapter(BaseAdapter):'
         self.response = response
 
     def write(self, value):
-        self.response.data = self.response.data.decode('utf-8') + value
+        self.response.data = self.response.data + value
 
     def set_header(self, key, value):
         self.response.headers[key] = value

rhodecode/lib/_vendor/authomatic/core.py

@@ -1156,7 +1156,7 b' class Response(ReprMixin):'
             if self.is_binary_string(content):
                 self._content = content
             else:
-                self._content = content.decode('utf-8')
+                self._content = content
         return self._content
 
     @property

rhodecode/lib/_vendor/authomatic/providers/oauth2.py

@@ -298,7 +298,7 b' class OAuth2(providers.AuthorizationProv'
             # unquote Cast to str to void b64decode translation error. Base64
             # should be str compatible.
             return json.loads(base64.urlsafe_b64decode(
-                unquote(str(state))).decode('utf-8'))[param]
+                unquote(str(state))))[param]
         else:
             return state if param == 'csrf' else ''
 

rhodecode/lib/dbmigrate/schema/db_1_4_0.py

@@ -156,7 +156,7 b' class RhodeCodeSetting(Base, BaseModel):'
 
     @validates('_app_settings_value')
     def validate_settings_value(self, key, val):
-        assert type(val) == unicode
+        assert type(val) == str
         return val
 
     @hybrid_property

rhodecode/lib/dbmigrate/schema/db_2_1_0.py

@@ -178,7 +178,7 b' class RhodeCodeSetting(Base, BaseModel):'
 
     @validates('_app_settings_value')
     def validate_settings_value(self, key, val):
-        assert type(val) == unicode
+        assert type(val) == str
         return val
 
     @hybrid_property

rhodecode/lib/feedgenerator/feedgenerator.py

@@ -57,7 +57,6 b' def rfc2822_date(date):'
     month = months[date.month - 1]
     time_str = date.strftime('%s, %%d %s %%Y %%H:%%M:%%S ' % (dow, month))
 
-    time_str = time_str.decode('utf-8')
     offset = date.utcoffset()
     # Historically, this function assumes that naive datetimes are in UTC.
     if offset is None:
@@ -73,7 +72,6 b' def rfc3339_date(date):'
     date = datetime_safe.new_datetime(date)
     time_str = date.strftime('%Y-%m-%dT%H:%M:%S')
 
-    time_str = time_str.decode('utf-8')
     offset = date.utcoffset()
     # Historically, this function assumes that naive datetimes are in UTC.
     if offset is None:

rhodecode/lib/helpers.py

@@ -1441,7 +1441,7 b' def gravatar_url(email_address, size=30,'
     _use_gravatar = request.call_context.visual.use_gravatar
 
     email_address = email_address or User.DEFAULT_USER_EMAIL
-    if isinstance(email_address, unicode):
+    if isinstance(email_address, str):
         # hashlib crashes on unicode items
         email_address = safe_str(email_address)
 

rhodecode/lib/hooks_daemon.py

@@ -79,7 +79,7 b' class HooksHttpHandler(BaseHTTPRequestHa'
             # support for new vcsserver msgpack based protocol hooks
             data = msgpack.unpackb(self.rfile.read(length), raw=False)
         else:
-            body = self.rfile.read(length).decode('utf-8')
+            body = self.rfile.read(length)
             data = json.loads(body)
 
         return hooks_proto, data['method'], data['extras']

rhodecode/lib/rc_cache/utils.py

@@ -285,7 +285,7 b' class InvalidationContext(object):'
         self.uid = uid
         self.invalidation_namespace = invalidation_namespace
         self.raise_exception = raise_exception
-        self.proc_id = safe_unicode(rhodecode.CONFIG.get('instance_id') or 'DEFAULT')
+        self.proc_id = rhodecode.CONFIG.get('instance_id') or 'DEFAULT'
         self.thread_id = 'global'
 
         if thread_scoped is None:

rhodecode/lib/vcs/backends/git/repository.py

@@ -240,7 +240,7 b' class GitRepository(BaseRepository):'
         commit_missing_err = "Commit {} does not exist for `{}`".format(
             *map(safe_str, [commit_id_or_idx, self.name]))
 
-        is_bstr = isinstance(commit_id_or_idx, (str, unicode))
+        is_bstr = isinstance(commit_id_or_idx, str)
         is_branch = reference_obj and reference_obj.branch
 
         lookup_ok = False

rhodecode/tests/lib/test_utils.py

@@ -180,7 +180,7 b' def _stub_git_repo(repo_path):'
     repo_path.ensure('.git', dir=True)
 
 
[e-mail]('str_class', [str, unicode], ids=['str', 'unicode'])
[e-mail]('str_class', [str, bytes], ids=['str', 'bytes'])
 def test_get_dirpaths_returns_all_paths(tmpdir, str_class):
     tmpdir.ensure('test-file')
     dirpaths = utils._get_dirpaths(str_class(tmpdir))

rhodecode/tests/models/test_scm.py

@@ -162,7 +162,7 b' def test_get_nodes_max_file_bytes(backen'
 def assert_contains_only_unicode(structure):
     assert structure
     for value in structure:
-        assert isinstance(value, unicode)
+        assert isinstance(value, str)
 
 
 @pytest.mark.backends("hg", "git")

rhodecode/tests/plugin.py

@@ -69,6 +69,12 b' from rhodecode.config import utils as co'
 
 log = logging.getLogger(__name__)
 
+
+def cmp(a, b):
+    # backport cmp from python2 so we can still use it in the custom code in this module
+    return (a > b) - (a < b)
+
+
 def _split_comma(value):
     return value.split(',')
 
@@ -872,7 +878,7 b' def _add_commits_to_repo(vcs_repo, commi'
     commit = None
 
     for idx, commit in enumerate(commits):
-        message = unicode(commit.get('message', 'Commit %s' % idx))
+        message = str(commit.get('message', 'Commit %s' % idx))
 
         for node in commit.get('added', []):
             imc.add(FileNode(node.path, content=node.content))
@@ -891,7 +897,7 b' def _add_commits_to_repo(vcs_repo, commi'
 
         commit = imc.commit(
             message=message,
-            author=unicode(commit.get('author', 'Automatic <[e-mail]>')),
+            author=str(commit.get('author', 'Automatic <[e-mail]>')),
             date=commit.get('date'),
             branch=commit.get('branch'),
             parents=parents)

rhodecode/tests/vcs/test_commits.py

@@ -592,5 +592,5 b' class TestCommitsChanges(BackendTestMixi'
 
 def assert_text_equal(expected, given):
     assert expected == given
-    assert isinstance(expected, unicode)
-    assert isinstance(given, unicode)
+    assert isinstance(expected, str)
+    assert isinstance(given, str)

rhodecode/tests/vcs/test_filenodes_unicode_path.py

@@ -29,7 +29,7 b' from rhodecode.tests.vcs.conftest import'
 class TestFileNodeUnicodePath(BackendTestMixin):
 
     fname = 'ąśðąęłąć.txt'
-    ufname = (fname).decode('utf-8')
+    ufname = fname
 
     @classmethod
     def _get_commits(cls):

rhodecode/tests/vcs/test_git.py

@@ -965,17 +965,17 b' class TestGitCommit(object):'
 
     def test_commit_message_is_unicode(self):
         for commit in self.repo:
-            assert type(commit.message) == unicode
+            assert type(commit.message) == str
 
     def test_commit_author_is_unicode(self):
         for commit in self.repo:
-            assert type(commit.author) == unicode
+            assert type(commit.author) == str
 
     def test_repo_files_content_is_unicode(self):
         commit = self.repo.get_commit()
         for node in commit.get_node('/'):
             if node.is_file():
-                assert type(node.content) == unicode
+                assert type(node.content) == str
 
     def test_wrong_path(self):
         # There is 'setup.py' in the root dir but not there:

rhodecode/tests/vcs/test_hg.py

@@ -1084,17 +1084,17 b' class TestMercurialCommit(object):'
 
     def test_commit_message_is_unicode(self):
         for cm in self.repo:
-            assert type(cm.message) == unicode
+            assert type(cm.message) == str
 
     def test_commit_author_is_unicode(self):
         for cm in self.repo:
-            assert type(cm.author) == unicode
+            assert type(cm.author) == str
 
     def test_repo_files_content_is_unicode(self):
         test_commit = self.repo.get_commit(commit_idx=100)
         for node in test_commit.get_node('/'):
             if node.is_file():
-                assert type(node.content) == unicode
+                assert type(node.content) == str
 
     def test_wrong_path(self):
         # There is 'setup.py' in the root dir but not there:

rhodecode/translation.py

@@ -36,9 +36,6 b' class _LazyString(object):'
             translator = req.translate
         return translator(*self.args, **self.kw)
 
-    def __unicode__(self):
-        return unicode(self.eval())
-
     def __str__(self):
         return self.eval()