engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

python3: fix urllib usage

Browse source
This commit is contained in:
RhodeCode Admin 2023-03-06 22:00:27 +01:00
parent 5392dc6c9c
commit c22758550a
75 changed files with 172 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rhodecode/apps/admin/tests/test_admin_audit_logs.py
View file

@ -32,7 +32,7 @@ from rhodecode.lib.utils2 import safe_unicode
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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/admin/tests/test_admin_defaults.py
View file

@ -25,7 +25,7 @@ from rhodecode.model.settings import SettingsModel
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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/admin/tests/test_admin_main_views.py
View file

@ -27,7 +27,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/admin/tests/test_admin_permissions.py
View file

@ -29,7 +29,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

8
rhodecode/apps/admin/tests/test_admin_repos.py
View file

@ -18,7 +18,7 @@
# 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 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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 @@ 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

4
rhodecode/apps/admin/tests/test_admin_repository_groups.py
View file

@ -34,7 +34,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/admin/tests/test_admin_settings.py
View file

@ -35,7 +35,7 @@ UPDATE_DATA_QUALNAME = 'rhodecode.model.update.UpdateModel.get_update_data'
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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/admin/tests/test_admin_user_groups.py
View file

@ -31,7 +31,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/admin/tests/test_admin_users.py
View file

@ -35,7 +35,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/admin/tests/test_admin_users_ssh_keys.py
View file

@ -29,7 +29,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/admin/views/system_info.py
View file

@ -19,7 +19,7 @@
# 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 @@ class AdminSystemInfoSettingsView(BaseAppView):
_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)

4
rhodecode/apps/file_store/tests/test_upload_file.py
View file

@ -28,7 +28,7 @@ from rhodecode.apps.file_store import utils, config_keys
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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/gist/tests/test_admin_gists.py
View file

@ -31,7 +31,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/home/tests/test_get_goto_switched_data.py
View file

@ -35,14 +35,14 @@ 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

4
rhodecode/apps/home/tests/test_get_repo_list_data.py
View file

@ -29,14 +29,14 @@ 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

4
rhodecode/apps/home/tests/test_get_user_data.py
View file

@ -29,7 +29,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/home/tests/test_get_user_group_data.py
View file

@ -49,7 +49,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/journal/tests/test_journal.py
View file

@ -28,7 +28,7 @@ from rhodecode.model.db import UserFollowing, Repository
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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/login/tests/test_login.py
View file

@ -39,7 +39,7 @@ whitelist_view = ['RepoCommitsView:repo_commit_raw']
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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/login/tests/test_password_reset.py
View file

@ -31,7 +31,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/my_account/tests/test_my_account_edit.py
View file

@ -45,7 +45,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/my_account/tests/test_my_account_notifications.py
View file

@ -35,7 +35,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/my_account/tests/test_my_account_ssh_keys.py
View file

@ -29,7 +29,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repo_group/tests/test_repo_groups_advanced.py
View file

@ -24,7 +24,7 @@ from rhodecode.tests import assert_session_flash
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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repo_group/tests/test_repo_groups_permissions.py
View file

@ -24,7 +24,7 @@ from rhodecode.tests.utils import permission_update_data_generator
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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repo_group/tests/test_repo_groups_settings.py
View file

@ -24,7 +24,7 @@ from rhodecode.tests import assert_session_flash
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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repository/tests/test_pull_requests_list.py
View file

@ -23,7 +23,7 @@ from rhodecode.model.db import Repository
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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repository/tests/test_repo_bookmarks.py
View file

@ -23,14 +23,14 @@ from rhodecode.model.db import Repository
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

4
rhodecode/apps/repository/tests/test_repo_branches.py
View file

@ -23,14 +23,14 @@ from rhodecode.model.db import Repository
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

4
rhodecode/apps/repository/tests/test_repo_changelog.py
View file

@ -29,7 +29,7 @@ MATCH_HASH = re.compile(r'<span class="commit_hash">r(\d+):[\da-f]+</span>')
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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repository/tests/test_repo_commit_comments.py
View file

@ -28,7 +28,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repository/tests/test_repo_commits.py
View file

@ -25,7 +25,7 @@ from rhodecode.lib.helpers import _shorten_commit_id
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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repository/tests/test_repo_compare.py
View file

@ -28,7 +28,7 @@ from rhodecode.tests.utils import AssertResponse, commit_change
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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repository/tests/test_repo_compare_local.py
View file

@ -24,7 +24,7 @@ from .test_repo_compare import ComparePage
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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repository/tests/test_repo_compare_on_single_file.py
View file

@ -30,7 +30,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repository/tests/test_repo_feed.py
View file

@ -24,7 +24,7 @@ from rhodecode.tests import TestController
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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repository/tests/test_repo_files.py
View file

@ -47,7 +47,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repository/tests/test_repo_forks.py
View file

@ -34,7 +34,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repository/tests/test_repo_issue_tracker.py
View file

@ -27,7 +27,7 @@ from rhodecode.model.settings import SettingsModel, IssueTrackerSettingsModel
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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repository/tests/test_repo_maintainance.py
View file

@ -33,7 +33,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repository/tests/test_repo_permissions.py
View file

@ -24,7 +24,7 @@ from rhodecode.tests.utils import permission_update_data_generator
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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repository/tests/test_repo_pullrequests.py
View file

@ -37,7 +37,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repository/tests/test_repo_settings.py
View file

@ -33,7 +33,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repository/tests/test_repo_settings_advanced.py
View file

@ -32,7 +32,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repository/tests/test_repo_summary.py
View file

@ -41,7 +41,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repository/tests/test_repo_tags.py
View file

@ -23,14 +23,14 @@ from rhodecode.model.db import Repository
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

4
rhodecode/apps/repository/tests/test_repo_vcs_settings.py
View file

@ -38,7 +38,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repository/tests/test_vcs_settings.py
View file

@ -28,7 +28,7 @@ from rhodecode.tests.utils import AssertResponse
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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/repository/views/repo_files.py
View file

@ -24,7 +24,7 @@ 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 @@ 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=\"{}\"; " \

4
rhodecode/apps/search/views.py
View file

@ -19,7 +19,7 @@
# 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 @@ def perform_search(request, tmpl_context, repo_name=None, repo_group_name=None):
'sort': search_sort
}
return '?' + urllib.urlencode(query_params)
return '?' + urllib.parse.urlencode(query_params)
c = tmpl_context
search_query = search_params.get('search_query')

4
rhodecode/apps/user_group/tests/test_user_groups.py
View file

@ -30,7 +30,7 @@ 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 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/apps/user_group/tests/test_user_groups_permissions.py
View file

@ -24,7 +24,7 @@ from rhodecode.tests.utils import permission_update_data_generator
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 @@ def route_path(name, params=None, **kwargs):
}[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

10
rhodecode/authentication/plugins/auth_crowd.py
View file

@ -26,7 +26,7 @@ RhodeCode authentication plugin for Atlassian CROWD
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 @@ 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 @@ 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

14
rhodecode/authentication/plugins/auth_jasig_cas.py
View file

@ -27,8 +27,8 @@ 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 @@ class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
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 @@ class RhodeCodeAuthPlugin(RhodeCodeExternalAuthPlugin):
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

4
rhodecode/config/rcextensions/utils.py
View file

@ -21,7 +21,7 @@ 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 @@ 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)

4
rhodecode/integrations/types/base.py
View file

@ -23,7 +23,7 @@ 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 @@ 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)

10
rhodecode/lib/diff_match_patch.py
View file

@ -31,7 +31,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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)

2
rhodecode/lib/feedgenerator/utils.py
View file

@ -5,7 +5,7 @@ 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

6
rhodecode/lib/helpers.py
View file

@ -32,7 +32,7 @@ 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 @@ def files_breadcrumbs(repo_name, repo_type, commit_id, file_path, landing_ref_na
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'

4
rhodecode/lib/middleware/simplehg.py
View file

@ -25,7 +25,7 @@ SimpleHG middleware for handling mercurial protocol request
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 @@ 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):

4
rhodecode/lib/middleware/simplesvn.py
View file

@ -20,7 +20,7 @@
import base64
import logging
import urllib
import urllib.request, urllib.parse, urllib.error
import urlparse
import requests
@ -124,7 +124,7 @@ 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):

13
rhodecode/lib/utils2.py
View file

@ -31,7 +31,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ def get_clone_url(request, uri_tmpl, repo_name, repo_id, repo_type, **override):
'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)

4
rhodecode/lib/vcs/backends/hg/repository.py
View file

@ -24,7 +24,7 @@ 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 @@ 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):

6
rhodecode/lib/vcs/backends/svn/repository.py
View file

@ -24,7 +24,7 @@ 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 @@ class SubversionRepository(base.BaseRepository):
"""
# 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 @@ class SubversionRepository(base.BaseRepository):
def _sanitize_url(url):
if '://' not in url:
url = 'file://' + urllib.pathname2url(url)
url = 'file://' + urllib.request.pathname2url(url)
return url

4
rhodecode/lib/vcs/client_http.py
View file

@ -26,7 +26,7 @@ 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 @@ log = logging.getLogger(__name__)
# HTTPApplication.ALLOWED_EXCEPTIONS
EXCEPTIONS_MAP = {
'KeyError': KeyError,
'URLError': urllib2.URLError,
'URLError': urllib.error.URLError,
}

4
rhodecode/lib/vcs/exceptions.py
View file

@ -23,7 +23,7 @@ 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 @@ _EXCEPTION_MAP = {
'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,
}

4
rhodecode/model/pull_request.py
View file

@ -29,7 +29,7 @@ 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 @@ 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):

4
rhodecode/model/update.py
View file

@ -19,7 +19,7 @@
# 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 @@ 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()

4
rhodecode/tests/__init__.py
View file

@ -246,10 +246,10 @@ 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

4
rhodecode/tests/functional/test_delegated_admin.py
View file

@ -25,7 +25,7 @@ from rhodecode.tests.fixture import 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 = {
@ -46,7 +46,7 @@ def route_path(name, params=None, **kwargs):
}[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

4
rhodecode/tests/load/profile.py
View file

@ -35,7 +35,7 @@ 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 @@ 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()

10
rhodecode/tests/scripts/test_crawler.py
View file

@ -28,8 +28,8 @@ 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 @@ 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 @@ 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)

4
rhodecode/tests/server_utils.py
View file

@ -26,8 +26,8 @@ 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

8
rhodecode/tests/utils.py
View file

@ -24,11 +24,11 @@ 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 @@ 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

2
rhodecode/tests/vcs/test_repository.py
View file

@ -19,7 +19,7 @@
# 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