python3: fix urllib usage

rhodecode/apps/admin/tests/test_admin_audit_logs.py

@@ -32,7 +32,7 b' from rhodecode.lib.utils2 import safe_un'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
     from rhodecode.apps._base import ADMIN_PREFIX
 
     base_url = {
@@ -42,7 +42,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/admin/tests/test_admin_defaults.py

@@ -25,7 +25,7 b' from rhodecode.model.settings import Set'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
     from rhodecode.apps._base import ADMIN_PREFIX
 
     base_url = {
@@ -36,7 +36,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/admin/tests/test_admin_main_views.py

@@ -27,7 +27,7 b' fixture = Fixture()'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
     from rhodecode.apps._base import ADMIN_PREFIX
 
     base_url = {
@@ -40,7 +40,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/admin/tests/test_admin_permissions.py

@@ -29,7 +29,7 b' from rhodecode.tests import ('
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
     from rhodecode.apps._base import ADMIN_PREFIX
 
     base_url = {
@@ -70,7 +70,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/admin/tests/test_admin_repos.py

@@ -18,7 +18,7 b''
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
-import urllib
+import urllib.request, urllib.parse, urllib.error
 
 import mock
 import pytest
@@ -43,7 +43,7 b' fixture = Fixture()'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'repos': ADMIN_PREFIX + '/repos',
@@ -55,7 +55,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 
@@ -494,7 +494,7 b' class TestAdminRepos(object):'
         assert response.json == {u'result': True}
 
         flash_msg = u'Created repository <a href="/{}">{}</a>'.format(
-            urllib.quote(repo_name_utf8), repo_name)
+            urllib.parse.quote(repo_name_utf8), repo_name)
         assert_session_flash(response, flash_msg)
 
         # test if the repo was created in the database

rhodecode/apps/admin/tests/test_admin_repository_groups.py

@@ -34,7 +34,7 b' fixture = Fixture()'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'repo_groups': ADMIN_PREFIX + '/repo_groups',
@@ -45,7 +45,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/admin/tests/test_admin_settings.py

@@ -35,7 +35,7 b" UPDATE_DATA_QUALNAME = 'rhodecode.model."
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
     from rhodecode.apps._base import ADMIN_PREFIX
 
     base_url = {
@@ -102,7 +102,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/admin/tests/test_admin_user_groups.py

@@ -31,7 +31,7 b' fixture = Fixture()'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
     from rhodecode.apps._base import ADMIN_PREFIX
 
     base_url = {
@@ -44,7 +44,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/admin/tests/test_admin_users.py

@@ -35,7 +35,7 b' fixture = Fixture()'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
     from rhodecode.apps._base import ADMIN_PREFIX
 
     base_url = {
@@ -97,7 +97,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/admin/tests/test_admin_users_ssh_keys.py

@@ -29,7 +29,7 b' fixture = Fixture()'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
     from rhodecode.apps._base import ADMIN_PREFIX
 
     base_url = {
@@ -45,7 +45,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/admin/views/system_info.py

@@ -19,7 +19,7 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import logging
-import urllib2
+import urllib.request, urllib.error, urllib.parse
 import os
 
 import rhodecode
@@ -209,7 +209,7 b' class AdminSystemInfoSettingsView(BaseAp'
         _err = lambda s: '<div style="color:#ff8888; padding:4px 0px">{}</div>'.format(s)
         try:
             data = UpdateModel().get_update_data(update_url)
-        except urllib2.URLError as e:
+        except urllib.error.URLError as e:
             log.exception("Exception contacting upgrade server")
             self.request.override_renderer = 'string'
             return _err('Failed to contact upgrade server: %r' % e)

rhodecode/apps/file_store/tests/test_upload_file.py

@@ -28,7 +28,7 b' from rhodecode.apps.file_store import ut'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'upload_file': '/_file_store/upload',
@@ -38,7 +38,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/gist/tests/test_admin_gists.py

@@ -31,7 +31,7 b' from rhodecode.tests import ('
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
     from rhodecode.apps._base import ADMIN_PREFIX
 
     base_url = {
@@ -50,7 +50,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/home/tests/test_get_goto_switched_data.py

@@ -35,14 +35,14 b' fixture = Fixture()'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'goto_switcher_data': '/_goto_data',
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/home/tests/test_get_repo_list_data.py

@@ -29,14 +29,14 b' fixture = Fixture()'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'repo_list_data': '/_repos',
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/home/tests/test_get_user_data.py

@@ -29,7 +29,7 b' fixture = Fixture()'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'user_autocomplete_data': '/_users',
@@ -37,7 +37,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/home/tests/test_get_user_group_data.py

@@ -49,7 +49,7 b' fixture = Fixture()'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'user_autocomplete_data': '/_users',
@@ -57,7 +57,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/journal/tests/test_journal.py

@@ -28,7 +28,7 b' from rhodecode.model.db import UserFollo'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'journal': ADMIN_PREFIX + '/journal',
@@ -43,7 +43,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/login/tests/test_login.py

@@ -39,7 +39,7 b" whitelist_view = ['RepoCommitsView:repo_"
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
     from rhodecode.apps._base import ADMIN_PREFIX
 
     base_url = {
@@ -61,7 +61,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/login/tests/test_password_reset.py

@@ -31,7 +31,7 b' fixture = Fixture()'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
     from rhodecode.apps._base import ADMIN_PREFIX
 
     base_url = {
@@ -50,7 +50,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/my_account/tests/test_my_account_edit.py

@@ -45,7 +45,7 b' from rhodecode.lib import helpers as h'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
     from rhodecode.apps._base import ADMIN_PREFIX
 
     base_url = {
@@ -56,7 +56,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/my_account/tests/test_my_account_notifications.py

@@ -35,7 +35,7 b' fixture = Fixture()'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
     from rhodecode.apps._base import ADMIN_PREFIX
 
     base_url = {
@@ -48,7 +48,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/my_account/tests/test_my_account_ssh_keys.py

@@ -29,7 +29,7 b' fixture = Fixture()'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
     from rhodecode.apps._base import ADMIN_PREFIX
 
     base_url = {
@@ -44,7 +44,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repo_group/tests/test_repo_groups_advanced.py

@@ -24,7 +24,7 b' from rhodecode.tests import assert_sessi'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'edit_repo_group_advanced':
@@ -34,7 +34,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repo_group/tests/test_repo_groups_permissions.py

@@ -24,7 +24,7 b' from rhodecode.tests.utils import permis'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'edit_repo_group_perms':
@@ -34,7 +34,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repo_group/tests/test_repo_groups_settings.py

@@ -24,7 +24,7 b' from rhodecode.tests import assert_sessi'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'edit_repo_group': '/{repo_group_name}/_edit',
@@ -32,7 +32,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_pull_requests_list.py

@@ -23,7 +23,7 b' from rhodecode.model.db import Repositor'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'pullrequest_show_all': '/{repo_name}/pull-request',
@@ -31,7 +31,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_repo_bookmarks.py

@@ -23,14 +23,14 b' from rhodecode.model.db import Repositor'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'bookmarks_home': '/{repo_name}/bookmarks',
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_repo_branches.py

@@ -23,14 +23,14 b' from rhodecode.model.db import Repositor'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'branches_home': '/{repo_name}/branches',
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_repo_changelog.py

@@ -29,7 +29,7 b' MATCH_HASH = re.compile(r\'<span class="c'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'repo_changelog': '/{repo_name}/changelog',
@@ -39,7 +39,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_repo_commit_comments.py

@@ -28,7 +28,7 b' from rhodecode.lib import helpers as h'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'repo_commit': '/{repo_name}/changeset/{commit_id}',
@@ -39,7 +39,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_repo_commits.py

@@ -25,7 +25,7 b' from rhodecode.lib.helpers import _short'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'repo_commit': '/{repo_name}/changeset/{commit_id}',
@@ -39,7 +39,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_repo_compare.py

@@ -28,7 +28,7 b' from rhodecode.tests.utils import Assert'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'repo_compare_select': '/{repo_name}/compare',
@@ -36,7 +36,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_repo_compare_local.py

@@ -24,7 +24,7 b' from .test_repo_compare import ComparePa'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'repo_compare_select': '/{repo_name}/compare',
@@ -32,7 +32,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_repo_compare_on_single_file.py

@@ -30,7 +30,7 b' fixture = Fixture()'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'repo_compare_select': '/{repo_name}/compare',
@@ -38,7 +38,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_repo_feed.py

@@ -24,7 +24,7 b' from rhodecode.tests import TestControll'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'rss_feed_home': '/{repo_name}/feed-rss',
@@ -34,7 +34,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_repo_files.py

@@ -47,7 +47,7 b' def get_node_history(backend_type):'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'repo_summary': '/{repo_name}',
@@ -76,7 +76,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_repo_forks.py

@@ -34,7 +34,7 b' fixture = Fixture()'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'repo_summary': '/{repo_name}',
@@ -46,7 +46,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_repo_issue_tracker.py

@@ -27,7 +27,7 b' from rhodecode.model.settings import Set'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'repo_summary': '/{repo_name}',
@@ -38,7 +38,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_repo_maintainance.py

@@ -33,7 +33,7 b' fixture = Fixture()'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'edit_repo_maintenance': '/{repo_name}/settings/maintenance',
@@ -42,7 +42,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_repo_permissions.py

@@ -24,7 +24,7 b' from rhodecode.tests.utils import permis'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'edit_repo_perms': '/{repo_name}/settings/permissions'
@@ -32,7 +32,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_repo_pullrequests.py

@@ -37,7 +37,7 b' from rhodecode.tests import ('
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'repo_changelog': '/{repo_name}/changelog',
@@ -60,7 +60,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_repo_settings.py

@@ -33,7 +33,7 b' fixture = Fixture()'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'edit_repo': '/{repo_name}/settings',
@@ -48,7 +48,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_repo_settings_advanced.py

@@ -32,7 +32,7 b' fixture = Fixture()'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'repo_summary_explicit': '/{repo_name}/summary',
@@ -47,7 +47,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_repo_summary.py

@@ -41,7 +41,7 b' fixture = Fixture()'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'repo_summary': '/{repo_name}',
@@ -52,7 +52,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_repo_tags.py

@@ -23,14 +23,14 b' from rhodecode.model.db import Repositor'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'tags_home': '/{repo_name}/tags',
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_repo_vcs_settings.py

@@ -38,7 +38,7 b' fixture = Fixture()'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'repo_summary': '/{repo_name}',
@@ -50,7 +50,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/tests/test_vcs_settings.py

@@ -28,7 +28,7 b' from rhodecode.tests.utils import Assert'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = {
         'edit_repo': '/{repo_name}/settings',
@@ -37,7 +37,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/repository/views/repo_files.py

@@ -24,7 +24,7 b' import os'
 import shutil
 import tempfile
 import collections
-import urllib
+import urllib.request, urllib.parse, urllib.error
 import pathlib2
 
 from pyramid.httpexceptions import HTTPNotFound, HTTPBadRequest, HTTPFound
@@ -804,7 +804,7 b' class RepoFilesView(RepoAppView):'
     def _get_attachement_headers(self, f_path):
         f_name = safe_str(f_path.split(Repository.NAME_SEP)[-1])
         safe_path = f_name.replace('"', '\\"')
-        encoded_path = urllib.quote(f_name)
+        encoded_path = urllib.parse.quote(f_name)
 
         return "attachment; " \
                "filename=\"{}\"; " \

rhodecode/apps/search/views.py

@@ -19,7 +19,7 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import logging
-import urllib
+import urllib.request, urllib.parse, urllib.error
 
 from webhelpers2.html.tools import update_params
 
@@ -69,7 +69,7 b' def perform_search(request, tmpl_context'
             'sort': search_sort
         }
 
-        return '?' + urllib.urlencode(query_params)
+        return '?' + urllib.parse.urlencode(query_params)
 
     c = tmpl_context
     search_query = search_params.get('search_query')

rhodecode/apps/user_group/tests/test_user_groups.py

@@ -30,7 +30,7 b' fixture = Fixture()'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
     from rhodecode.apps._base import ADMIN_PREFIX
 
     base_url = {
@@ -48,7 +48,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/apps/user_group/tests/test_user_groups_permissions.py

@@ -24,7 +24,7 b' from rhodecode.tests.utils import permis'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
     from rhodecode.apps._base import ADMIN_PREFIX
 
     base_url = {
@@ -35,7 +35,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/authentication/plugins/auth_crowd.py

@@ -26,7 +26,7 b' RhodeCode authentication plugin for Atla'
 import colander
 import base64
 import logging
-import urllib2
+import urllib.request, urllib.error, urllib.parse
 
 from rhodecode.translation import _
 from rhodecode.authentication.base import (
@@ -128,10 +128,10 b' class CrowdServer(object):'
         self._make_opener()
 
     def _make_opener(self):
-        mgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
+        mgr = urllib.request.HTTPPasswordMgrWithDefaultRealm()
         mgr.add_password(None, self._uri, self.user, self.passwd)
-        handler = urllib2.HTTPBasicAuthHandler(mgr)
-        self.opener = urllib2.build_opener(handler)
+        handler = urllib.request.HTTPBasicAuthHandler(mgr)
+        self.opener = urllib.request.build_opener(handler)
 
     def _request(self, url, body=None, headers=None,
                  method=None, noformat=False,
@@ -146,7 +146,7 b' class CrowdServer(object):'
         log.debug("Sent crowd: \n%s"
                   % (formatted_json({"url": url, "body": body,
                                            "headers": _headers})))
-        request = urllib2.Request(url, body, _headers)
+        request = urllib.request.Request(url, body, _headers)
         if method:
             request.get_method = lambda: method
 

rhodecode/authentication/plugins/auth_jasig_cas.py

@@ -27,8 +27,8 b' http://www.jasig.org/cas'
 import colander
 import logging
 import rhodecode
-import urllib
-import urllib2
+import urllib.request, urllib.parse, urllib.error
+import urllib.request, urllib.error, urllib.parse
 
 from rhodecode.translation import _
 from rhodecode.authentication.base import (
@@ -123,7 +123,7 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
             return None
 
         log.debug("Jasig CAS settings: %s", settings)
-        params = urllib.urlencode({'username': username, 'password': password})
+        params = urllib.parse.urlencode({'username': username, 'password': password})
         headers = {"Content-type": "application/x-www-form-urlencoded",
                    "Accept": "text/plain",
                    "User-Agent": "RhodeCode-auth-%s" % rhodecode.__version__}
@@ -131,13 +131,13 b' class RhodeCodeAuthPlugin(RhodeCodeExter'
 
         log.debug("Sent Jasig CAS: \n%s",
                   {"url": url, "body": params, "headers": headers})
-        request = urllib2.Request(url, params, headers)
+        request = urllib.request.Request(url, params, headers)
         try:
-            response = urllib2.urlopen(request)
-        except urllib2.HTTPError as e:
+            response = urllib.request.urlopen(request)
+        except urllib.error.HTTPError as e:
             log.debug("HTTPError when requesting Jasig CAS (status code: %d)", e.code)
             return None
-        except urllib2.URLError as e:
+        except urllib.error.URLError as e:
             log.debug("URLError when requesting Jasig CAS url: %s ", url)
             return None
 

rhodecode/config/rcextensions/utils.py

@@ -21,7 +21,7 b' import os'
 import string
 import functools
 import collections
-import urllib
+import urllib.request, urllib.parse, urllib.error
 
 log = logging.getLogger('rhodecode.' + __name__)
 
@@ -195,5 +195,5 b' class UrlTemplate(string.Template):'
 
     def safe_substitute(self, **kws):
         # url encode the kw for usage in url
-        kws = {k: urllib.quote(str(v)) for k, v in kws.items()}
+        kws = {k: urllib.parse.quote(str(v)) for k, v in kws.items()}
         return super(UrlTemplate, self).safe_substitute(**kws)

rhodecode/integrations/types/base.py

@@ -23,7 +23,7 b' import string'
 import collections
 import logging
 import requests
-import urllib
+import urllib.request, urllib.parse, urllib.error
 from requests.adapters import HTTPAdapter
 from requests.packages.urllib3.util.retry import Retry
 
@@ -40,7 +40,7 b' class UrlTmpl(string.Template):'
 
     def safe_substitute(self, **kws):
         # url encode the kw for usage in url
-        kws = {k: urllib.quote(safe_str(v)) for k, v in kws.items()}
+        kws = {k: urllib.parse.quote(safe_str(v)) for k, v in kws.items()}
         return super(UrlTmpl, self).safe_substitute(**kws)
 
 

rhodecode/lib/diff_match_patch.py

@@ -31,7 +31,7 b' import math'
 import re
 import sys
 import time
-import urllib
+import urllib.request, urllib.parse, urllib.error
 
 
 class diff_match_patch:
@@ -1152,7 +1152,7 b' class diff_match_patch:'
       if op == self.DIFF_INSERT:
         # High ascii will raise UnicodeDecodeError.  Use Unicode instead.
         data = data.encode("utf-8")
-        text.append("+" + urllib.quote(data, "!~*'();/?:@&=+$,# "))
+        text.append("+" + urllib.parse.quote(data, "!~*'();/?:@&=+$,# "))
       elif op == self.DIFF_DELETE:
         text.append("-%d" % len(data))
       elif op == self.DIFF_EQUAL:
@@ -1188,7 +1188,7 b' class diff_match_patch:'
       # operation of this token (delete, insert, equality).
       param = token[1:]
       if token[0] == "+":
-        param = urllib.unquote(param).decode("utf-8")
+        param = urllib.parse.unquote(param).decode("utf-8")
         diffs.append((self.DIFF_INSERT, param))
       elif token[0] == "-" or token[0] == "=":
         try:
@@ -1847,7 +1847,7 b' class diff_match_patch:'
           sign = text[0][0]
         else:
           sign = ''
-        line = urllib.unquote(text[0][1:])
+        line = urllib.parse.unquote(text[0][1:])
         line = line.decode("utf-8")
         if sign == '+':
           # Insertion.
@@ -1915,5 +1915,5 b' class patch_obj:'
         text.append(" ")
       # High ascii will raise UnicodeDecodeError.  Use Unicode instead.
       data = data.encode("utf-8")
-      text.append(urllib.quote(data, "!~*'();/?:@&=+$,# ") + "\n")
+      text.append(urllib.parse.quote(data, "!~*'();/?:@&=+$,# ") + "\n")
     return "".join(text)
  No newline at end of file

rhodecode/lib/feedgenerator/utils.py

@@ -5,7 +5,7 b' Utilities for XML generation/parsing.'
 import six
 
 from xml.sax.saxutils import XMLGenerator, quoteattr
-from urllib import quote
+from urllib.parse import quote
 from rhodecode.lib.utils import safe_str, safe_unicode
 
 

rhodecode/lib/helpers.py

@@ -32,7 +32,7 b' import random'
 import hashlib
 import StringIO
 import textwrap
-import urllib
+import urllib.request, urllib.parse, urllib.error
 import math
 import logging
 import re
@@ -336,13 +336,13 b' def files_breadcrumbs(repo_name, repo_ty'
 
 
 def files_url_data(request):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
     matchdict = request.matchdict
 
     if 'f_path' not in matchdict:
         matchdict['f_path'] = ''
     else:
-        matchdict['f_path'] = urllib.quote(safe_str(matchdict['f_path']))
+        matchdict['f_path'] = urllib.parse.quote(safe_str(matchdict['f_path']))
     if 'commit_id' not in matchdict:
         matchdict['commit_id'] = 'tip'
 

rhodecode/lib/middleware/simplehg.py

@@ -25,7 +25,7 b' SimpleHG middleware for handling mercuri'
 
 import logging
 import urlparse
-import urllib
+import urllib.request, urllib.parse, urllib.error
 
 from rhodecode.lib import utils
 from rhodecode.lib.ext_json import json
@@ -91,7 +91,7 b' class SimpleHg(simplevcs.SimpleVCS):'
             if not head:
                 break
             i += 1
-            chunks.append(urllib.unquote_plus(head))
+            chunks.append(urllib.parse.unquote_plus(head))
         full_arg = ''.join(chunks)
         pref = 'cmds='
         if full_arg.startswith(pref):

rhodecode/lib/middleware/simplesvn.py

@@ -20,7 +20,7 b''
 
 import base64
 import logging
-import urllib
+import urllib.request, urllib.parse, urllib.error
 import urlparse
 
 import requests
@@ -124,7 +124,7 b' class SimpleSvnApp(object):'
     def _get_url(self, svn_http_server, path):
         svn_http_server_url = (svn_http_server or '').rstrip('/')
         url_path = urlparse.urljoin(svn_http_server_url + '/', (path or '').lstrip('/'))
-        url_path = urllib.quote(url_path, safe="/:=~+!$,;'")
+        url_path = urllib.parse.quote(url_path, safe="/:=~+!$,;'")
         return url_path
 
     def _get_request_headers(self, environ):

rhodecode/lib/utils2.py

@@ -31,7 +31,7 b' import logging'
 import re
 import sys
 import time
-import urllib
+import urllib.request, urllib.parse, urllib.error
 import urlobject
 import uuid
 import getpass
@@ -433,8 +433,7 b' def get_encryption_key(config):'
     return secret or default
 
 
-def age(prevdate, now=None, show_short_version=False, show_suffix=True,
-        short_format=False):
+def age(prevdate, now=None, show_short_version=False, show_suffix=True, short_format=False):
     """
     Turns a datetime into an age string.
     If show_short_version is True, this generates a shorter string with
@@ -602,7 +601,7 b' def cleaned_uri(uri):'
     :param uri:
     :return: uri without this chars
     """
-    return urllib.quote(uri, safe='@$:/')
+    return urllib.parse.quote(uri, safe='@$:/')
 
 
 def credentials_filter(uri):
@@ -632,7 +631,7 b' def get_host_info(request):'
 
     qualified_home_url = request.route_url('home')
     parsed_url = urlobject.URLObject(qualified_home_url)
-    decoded_path = safe_unicode(urllib.unquote(parsed_url.path.rstrip('/')))
+    decoded_path = safe_unicode(urllib.parse.unquote(parsed_url.path.rstrip('/')))
 
     return {
         'scheme': parsed_url.scheme,
@@ -644,7 +643,7 b' def get_host_info(request):'
 def get_clone_url(request, uri_tmpl, repo_name, repo_id, repo_type, **override):
     qualified_home_url = request.route_url('home')
     parsed_url = urlobject.URLObject(qualified_home_url)
-    decoded_path = safe_unicode(urllib.unquote(parsed_url.path.rstrip('/')))
+    decoded_path = safe_unicode(urllib.parse.unquote(parsed_url.path.rstrip('/')))
 
     args = {
         'scheme': parsed_url.scheme,
@@ -659,7 +658,7 b' def get_clone_url(request, uri_tmpl, rep'
         'repo_type': repo_type
     }
     args.update(override)
-    args['user'] = urllib.quote(safe_str(args['user']))
+    args['user'] = urllib.parse.quote(safe_str(args['user']))
 
     for k, v in args.items():
         uri_tmpl = uri_tmpl.replace('{%s}' % k, v)

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

@@ -24,7 +24,7 b' HG repository module'
 import os
 import logging
 import binascii
-import urllib
+import urllib.request, urllib.parse, urllib.error
 
 from zope.cachedescriptors.property import Lazy as LazyProperty
 
@@ -427,7 +427,7 b' class MercurialRepository(BaseRepository'
         """
         url = url.encode('utf8')
         if url != 'default' and '://' not in url:
-            url = "file:" + urllib.pathname2url(url)
+            url = "file:" + urllib.request.pathname2url(url)
         return url
 
     def get_hook_location(self):

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

@@ -24,7 +24,7 b' SVN repository module'
 
 import logging
 import os
-import urllib
+import urllib.request, urllib.parse, urllib.error
 
 from zope.cachedescriptors.property import Lazy as LazyProperty
 
@@ -234,7 +234,7 b' class SubversionRepository(base.BaseRepo'
         """
         # convert to URL if it's a local directory
         if os.path.isdir(url):
-            url = 'file://' + urllib.pathname2url(url)
+            url = 'file://' + urllib.request.pathname2url(url)
         return connection.Svn.check_url(url, config.serialize())
 
     @staticmethod
@@ -366,5 +366,5 b' class SubversionRepository(base.BaseRepo'
 
 def _sanitize_url(url):
     if '://' not in url:
-        url = 'file://' + urllib.pathname2url(url)
+        url = 'file://' + urllib.request.pathname2url(url)
     return url

rhodecode/lib/vcs/client_http.py

@@ -26,7 +26,7 b' import copy'
 import logging
 import threading
 import time
-import urllib2
+import urllib.request, urllib.error, urllib.parse
 import urlparse
 import uuid
 import traceback
@@ -50,7 +50,7 b' log = logging.getLogger(__name__)'
 # HTTPApplication.ALLOWED_EXCEPTIONS
 EXCEPTIONS_MAP = {
     'KeyError': KeyError,
-    'URLError': urllib2.URLError,
+    'URLError': urllib.error.URLError,
 }
 
 

rhodecode/lib/vcs/exceptions.py

@@ -23,7 +23,7 b' Custom vcs exceptions module.'
 """
 import logging
 import functools
-import urllib2
+import urllib.request, urllib.error, urllib.parse
 import rhodecode
 
 log = logging.getLogger(__name__)
@@ -166,7 +166,7 b' class UnhandledException(VCSError):'
     'unhandled': UnhandledException,
     # TODO: johbo: Define our own exception for this and stop abusing
     # urllib's exception class.
-    'url_error': urllib2.URLError,
+    'url_error': urllib.error.URLError,
     'subrepo_merge_error': SubrepoMergeError,
 }
 

rhodecode/model/pull_request.py

@@ -29,7 +29,7 b' import logging'
 import os
 
 import datetime
-import urllib
+import urllib.request, urllib.parse, urllib.error
 import collections
 
 from pyramid.threadlocal import get_current_request
@@ -1597,7 +1597,7 b' class PullRequestModel(BaseModel):'
         if pull_request.is_closed():
             return None
         else:
-            pr_url = urllib.unquote(self.get_url(pull_request, request=request))
+            pr_url = urllib.parse.unquote(self.get_url(pull_request, request=request))
             return safe_unicode('{pr_url}/repository'.format(pr_url=pr_url))
 
     def _notify_reviewers(self, pull_request, user_ids, role, user):

rhodecode/model/update.py

@@ -19,7 +19,7 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import logging
-import urllib2
+import urllib.request, urllib.error, urllib.parse
 from packaging.version import Version
 
 import rhodecode
@@ -41,7 +41,7 b' class UpdateModel(BaseModel):'
         """Return the JSON update data."""
         ver = rhodecode.__version__
         log.debug('Checking for upgrade on `%s` server', update_url)
-        opener = urllib2.build_opener()
+        opener = urllib.request.build_opener()
         opener.addheaders = [('User-agent', 'RhodeCode-SCM/%s' % ver)]
         response = opener.open(update_url)
         response_data = response.read()

rhodecode/tests/__init__.py

@@ -246,10 +246,10 b' def no_newline_id_generator(test_name):'
 
 
 def route_path_generator(url_defs, name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
 
     base_url = url_defs[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url

rhodecode/tests/functional/test_delegated_admin.py

@@ -25,7 +25,7 b' from rhodecode.tests.fixture import Fixt'
 
 
 def route_path(name, params=None, **kwargs):
-    import urllib
+    import urllib.request, urllib.parse, urllib.error
     from rhodecode.apps._base import ADMIN_PREFIX
 
     base_url = {
@@ -46,7 +46,7 b' def route_path(name, params=None, **kwar'
     }[name].format(**kwargs)
 
     if params:
-        base_url = '{}?{}'.format(base_url, urllib.urlencode(params))
+        base_url = '{}?{}'.format(base_url, urllib.parse.urlencode(params))
     return base_url
 
 

rhodecode/tests/load/profile.py

@@ -35,7 +35,7 b' import subprocess32'
 import sys
 import time
 import traceback
-import urllib
+import urllib.request, urllib.parse, urllib.error
 
 PROFILING_INTERVAL = 5
 RC_WEBSITE = "http://localhost:5001/"
@@ -130,7 +130,7 b' rc.stdin.write("y\\n")'
 # Verify that the website is up
 time.sleep(4)
 try:
-    urllib.urlopen(RC_WEBSITE)
+    urllib.request.urlopen(RC_WEBSITE)
 except IOError:
     print("RC - Website not started")
     vcs.terminate()

rhodecode/tests/scripts/test_crawler.py

@@ -28,8 +28,8 b' watch -n1 ./rhodecode/tests/mem_watch'
 
 
 import cookielib
-import urllib
-import urllib2
+import urllib.request, urllib.parse, urllib.error
+import urllib.request, urllib.error, urllib.parse
 import time
 import os
 import sys
@@ -66,13 +66,13 b' PROJECTS = ['
 
 
 cj = cookielib.FileCookieJar('/tmp/rc_test_cookie.txt')
-o = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))
+o = urllib.request.build_opener(urllib.request.HTTPCookieProcessor(cj))
 o.addheaders = [
     ('User-agent', 'rhodecode-crawler'),
     ('Accept-Language', 'en - us, en;q = 0.5')
 ]
 
-urllib2.install_opener(o)
+urllib.request.install_opener(o)
 
 
 def _get_repo(proj):
@@ -94,7 +94,7 b' def test_changelog_walk(proj, pages=100)'
 
         page = '/'.join((proj, 'changelog',))
 
-        full_uri = (BASE_URI % page) + '?' + urllib.urlencode({'page': i})
+        full_uri = (BASE_URI % page) + '?' + urllib.parse.urlencode({'page': i})
         s = time.time()
         f = o.open(full_uri)
 

rhodecode/tests/server_utils.py

@@ -26,8 +26,8 b' import pytest'
 import subprocess32
 import configobj
 import logging
-
-from urllib2 import urlopen, URLError
+from urllib.request import urlopen
+from urllib.error import URLError
 from pyramid.compat import configparser
 
 

rhodecode/tests/utils.py

@@ -24,11 +24,11 b' import logging'
 import os.path
 import subprocess32
 import tempfile
-import urllib2
+import urllib.request, urllib.error, urllib.parse
 from lxml.html import fromstring, tostring
 from lxml.cssselect import CSSSelector
 from urlparse import urlparse, parse_qsl
-from urllib import unquote_plus
+from urllib.parse import unquote_plus
 import webob
 
 from webtest.app import TestResponse, TestApp, string_types
@@ -390,8 +390,8 b' def wait_for_url(url, timeout=10):'
 
 def is_url_reachable(url):
     try:
-        urllib2.urlopen(url)
-    except urllib2.URLError:
+        urllib.request.urlopen(url)
+    except urllib.error.URLError:
         log.exception('URL `{}` reach error'.format(url))
         return False
     return True

rhodecode/tests/vcs/test_repository.py

@@ -19,7 +19,7 b''
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import datetime
-from urllib2 import URLError
+from urllib.error import URLError
 
 import mock
 import pytest