mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Remove old Python 2 compatibility code. Fixes #5700
This commit is contained in:
parent
7a22cff28c
commit
f93cfe8c4c
@ -14,6 +14,7 @@ Housekeeping
|
||||
************
|
||||
|
||||
| `Issue #5324 <https://redmine.postgresql.org/issues/5324>`_ - Improve code coverage and API test cases for Foreign Servers and User Mappings.
|
||||
| `Issue #5700 <https://redmine.postgresql.org/issues/5700>`_ - Remove old Python 2 compatibility code.
|
||||
|
||||
Bug fixes
|
||||
*********
|
||||
|
@ -12,7 +12,6 @@
|
||||
# This utility will allow us to change the copyright year information from
|
||||
# all the files present in FILE_EXTENSIONS variable at once
|
||||
|
||||
from __future__ import print_function
|
||||
import os
|
||||
import sys
|
||||
import re
|
||||
|
@ -17,12 +17,8 @@ import os
|
||||
import platform
|
||||
import subprocess
|
||||
import sys
|
||||
try:
|
||||
from urllib.request import urlopen, urlretrieve
|
||||
from urllib.error import URLError
|
||||
except Exception:
|
||||
from urllib import urlopen, urlretrieve
|
||||
URLError = Exception
|
||||
from urllib.request import urlopen, urlretrieve
|
||||
from urllib.error import URLError
|
||||
import zipfile
|
||||
|
||||
|
||||
|
@ -13,7 +13,6 @@
|
||||
# pgsql keywords from the code git paths mentioned in PG_CODES_URLS
|
||||
# Note that, PG_CODES_URLS may need to be changed manually per version change
|
||||
|
||||
from __future__ import print_function
|
||||
import re
|
||||
import requests
|
||||
import argparse
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import with_statement
|
||||
from alembic import context
|
||||
from sqlalchemy import engine_from_config, pool
|
||||
import logging
|
||||
|
@ -15,6 +15,7 @@ from smtplib import SMTPConnectError, SMTPResponseException, \
|
||||
SMTPServerDisconnected, SMTPDataError, SMTPHeloError, SMTPException, \
|
||||
SMTPAuthenticationError, SMTPSenderRefused, SMTPRecipientsRefused
|
||||
from socket import error as SOCKETErrorException
|
||||
import urllib.request as urlopen
|
||||
|
||||
import six
|
||||
from flask import current_app, render_template, url_for, make_response, \
|
||||
@ -47,11 +48,6 @@ from pgadmin.utils.master_password import validate_master_password, \
|
||||
set_crypt_key, process_masterpass_disabled
|
||||
from pgadmin.model import User
|
||||
|
||||
try:
|
||||
import urllib.request as urlreq
|
||||
except ImportError as e:
|
||||
import urllib2 as urlreq
|
||||
|
||||
try:
|
||||
from flask_security.views import default_render_json
|
||||
except ImportError as e:
|
||||
@ -608,9 +604,9 @@ def index():
|
||||
# It stuck on rendering the browser.html, while working in the
|
||||
# broken network.
|
||||
if os.path.exists(config.CA_FILE):
|
||||
response = urlreq.urlopen(url, data, 5, cafile=config.CA_FILE)
|
||||
response = urlopen(url, data, 5, cafile=config.CA_FILE)
|
||||
else:
|
||||
response = urlreq.urlopen(url, data, 5)
|
||||
response = urlopen(url, data, 5)
|
||||
current_app.logger.debug(
|
||||
'Version check HTTP response code: %d' % response.getcode()
|
||||
)
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
from pgadmin.browser.server_groups.servers.databases.tests import \
|
||||
utils as database_utils
|
||||
from pgadmin.utils.route import BaseTestGenerator
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
from pgadmin.browser.server_groups.servers.databases.tests import \
|
||||
utils as database_utils
|
||||
from pgadmin.utils.route import BaseTestGenerator
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
from pgadmin.browser.server_groups.servers.databases.tests import \
|
||||
utils as database_utils
|
||||
from pgadmin.utils.route import BaseTestGenerator
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
from pgadmin.browser.server_groups.servers.databases.tests import \
|
||||
utils as database_utils
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
from pgadmin.browser.server_groups.servers.databases.tests import \
|
||||
utils as database_utils
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
from pgadmin.browser.server_groups.servers.databases.tests import \
|
||||
utils as database_utils
|
||||
from pgadmin.utils.route import BaseTestGenerator
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
from pgadmin.browser.server_groups.servers.databases.tests import \
|
||||
utils as database_utils
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
from pgadmin.browser.server_groups.servers.databases.tests import \
|
||||
utils as database_utils
|
||||
from pgadmin.utils.route import BaseTestGenerator
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
from pgadmin.browser.server_groups.servers.databases.tests import \
|
||||
utils as database_utils
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
from pgadmin.browser.server_groups.servers.databases.tests import \
|
||||
utils as database_utils
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
from regression.python_test_utils.test_utils import *
|
||||
import os
|
||||
import json
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import sys
|
||||
import traceback
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import json
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
from pgadmin.browser.server_groups.servers.databases.tests import \
|
||||
utils as database_utils
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
import json
|
||||
|
||||
from pgadmin.browser.server_groups.servers.databases.tests import \
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
from pgadmin.browser.server_groups.servers.databases.tests import \
|
||||
utils as database_utils
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import json
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import sys
|
||||
import traceback
|
||||
|
@ -7,8 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
import six
|
||||
|
||||
from pgadmin.browser.server_groups.servers\
|
||||
.databases.external_tables import ExternalTablesModule
|
||||
from pgadmin.utils.route import BaseTestGenerator
|
||||
@ -90,7 +88,7 @@ class TestExternalTablesModule(BaseTestGenerator):
|
||||
module.generate_browser_collection_node = Mock()
|
||||
|
||||
result = module.get_nodes(**self.function_parameters)
|
||||
six.next(result)
|
||||
next(result)
|
||||
|
||||
module.generate_browser_collection_node.assert_called_with(
|
||||
self.expected_generate_browser_collection_node_called_with
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import json
|
||||
import uuid
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
import json
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
import json
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import json
|
||||
import uuid
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import json
|
||||
import uuid
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
import json
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import json
|
||||
import uuid
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import json
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
import json
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
import json
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import json
|
||||
import uuid
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import sys
|
||||
import traceback
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import json
|
||||
import uuid
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
import uuid
|
||||
from pgadmin.browser.server_groups.servers.databases.tests import \
|
||||
utils as database_utils
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
import json
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
from regression import parent_node_dict
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
from pgadmin.browser.server_groups.servers.databases.tests import \
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
from . import utils as language_utils
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import json
|
||||
import uuid
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
from pgadmin.utils.route import BaseTestGenerator
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import sys
|
||||
import traceback
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import sys
|
||||
import traceback
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import sys
|
||||
import traceback
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import sys
|
||||
import traceback
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import json
|
||||
import uuid
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
import json
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import json
|
||||
import uuid
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import json
|
||||
import uuid
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
from unittest.mock import patch
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
import json
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import json
|
||||
import uuid
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
from unittest.mock import patch
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
from unittest.mock import patch
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
from unittest.mock import patch
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
from unittest.mock import patch
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import json
|
||||
import uuid
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
from unittest.mock import patch
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import json
|
||||
import uuid
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
import json
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import json
|
||||
import uuid
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
from unittest.mock import patch
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
from unittest.mock import patch
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import json
|
||||
import uuid
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import json
|
||||
import uuid
|
||||
|
@ -7,7 +7,6 @@
|
||||
#
|
||||
##########################################################################
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import uuid
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user