python3: another 2to3 pass

vcsserver/lib/_vendor/jsonlogger/__init__.py

@@ -132,7 +132,7 b' class JsonFormatter(ExceptionAwareFormat'
         self.json_ensure_ascii = kwargs.pop("json_ensure_ascii", True)
         self.prefix = kwargs.pop("prefix", "")
         reserved_attrs = kwargs.pop("reserved_attrs", RESERVED_ATTRS)
-        self.reserved_attrs = dict(zip(reserved_attrs, reserved_attrs))
+        self.reserved_attrs = dict(list(zip(reserved_attrs, reserved_attrs)))
         self.timestamp = kwargs.pop("timestamp", True)
 
         # super(JsonFormatter, self).__init__(*args, **kwargs)
@@ -141,8 +141,8 b' class JsonFormatter(ExceptionAwareFormat'
             self.json_encoder = JsonEncoder
 
         self._required_fields = self.parse()
-        self._skip_fields = dict(zip(self._required_fields,
-                                     self._required_fields))
+        self._skip_fields = dict(list(zip(self._required_fields,
+                                     self._required_fields)))
         self._skip_fields.update(self.reserved_attrs)
 
     def _str_to_fn(self, fn_as_str):

vcsserver/lib/memory_lru_dict.py

@@ -45,7 +45,7 b' class LRUDict(LRUCache):'
         del self.data[key]
 
     def keys(self):
-        return self.data.keys()
+        return list(self.data.keys())
 
 
 class LRUDictDebug(LRUDict):
@@ -53,7 +53,7 b' class LRUDictDebug(LRUDict):'
     Wrapper to provide some debug options
     """
     def _report_keys(self):
-        elems_cnt = '%s/%s' % (len(self.keys()), self.size)
+        elems_cnt = '%s/%s' % (len(list(self.keys())), self.size)
         # trick for pformat print it more nicely
         fmt = '\n'
         for cnt, elem in enumerate(self.keys()):

vcsserver/lib/rc_cache/backends.py

@@ -153,7 +153,7 b' class FileNamespaceBackend(PickleSeriali'
 
         with self._dbm_file(True) as dbm:
             try:
-                return filter(cond, dbm.keys())
+                return list(filter(cond, list(dbm.keys())))
             except Exception:
                 log.error('Failed to fetch DBM keys from DB: %s', self.get_store())
                 raise

vcsserver/lib/rc_cache/utils.py

@@ -162,7 +162,7 b' def get_or_create_region(region_name, re'
     if not region_obj:
         raise EnvironmentError(
             'Region `{}` not in configured: {}.'.format(
-                region_name, region_meta.dogpile_cache_regions.keys()))
+                region_name, list(region_meta.dogpile_cache_regions.keys())))
 
     region_uid_name = '{}:{}'.format(region_name, region_namespace)
     if isinstance(region_obj.actual_backend, FileNamespaceBackend):

vcsserver/remote/svn.py

@@ -283,7 +283,7 b' class SvnRemote(RemoteBase):'
         return _node_properties(repo_id, path, revision)
 
     def file_annotate(self, wire, path, revision):
-        abs_path = 'file://' + urllib.pathname2url(
+        abs_path = 'file://' + urllib.request.pathname2url(
             vcspath.join(wire['path'], path))
         file_uri = svn.core.svn_path_canonicalize(abs_path)
 

vcsserver/tests/fixture.py

@@ -57,8 +57,8 b' class ContextINI(object):'
             self.new_path, file_error=True, write_empty_values=True)
 
         for data in self.ini_params:
-            section, ini_params = data.items()[0]
-            key, val = ini_params.items()[0]
+            section, ini_params = list(data.items())[0]
+            key, val = list(ini_params.items())[0]
             if section not in config:
                 config[section] = {}
             config[section][key] = val

vcsserver/tests/test_git.py

@@ -79,7 +79,7 b' class TestGitFetch(object):'
             mock_fetch.side_effect = side_effect
             self.remote_git.pull(
                 wire={}, url='/tmp/', apply_refs=False,
-                refs=selected_refs.keys())
+                refs=list(selected_refs.keys()))
             determine_wants = self.mock_repo.object_store.determine_wants_all
             assert determine_wants.call_count == 0
 

vcsserver/tests/test_utils.py

@@ -21,7 +21,7 b' from vcsserver.utils import ascii_bytes,'
 
 @pytest.mark.parametrize('given, expected', [
     ('a', b'a'),
-    (u'a', b'a'),
+    ('a', b'a'),
 ])
 def test_ascii_bytes(given, expected):
     assert ascii_bytes(given) == expected
@@ -44,9 +44,9 b' def test_ascii_str(given, expected):'
 
 
 @pytest.mark.parametrize('given', [
-    u'a',
+    'a',
     'å'.encode('utf8'),
-    u'å'
+    'å'
 ])
 def test_ascii_str_raises(given):
     with pytest.raises(ValueError):