Remove Python2 modules.

refs #5443

web/pgadmin/tools/sqleditor/__init__.py

@@ -18,6 +18,7 @@ from flask import Response, url_for, render_template, session, request, \
     current_app
 from flask_babelex import gettext
 from flask_security import login_required, current_user
+from urllib.parse import unquote
 
 from config import PG_DEFAULT_DRIVER, ON_DEMAND_RECORD_COUNT
 from pgadmin.misc.file_manager import Filemanager
@@ -46,12 +47,6 @@ from pgadmin.tools.sqleditor.utils.query_history import QueryHistory
 
 MODULE_NAME = 'sqleditor'
 
-# import unquote from urllib for python2.x and python3.x
-try:
-    from urllib import unquote
-except ImportError:
-    from urllib.parse import unquote
-
 
 class SqlEditorModule(PgAdminModule):
     """

web/pgadmin/tools/sqleditor/command.py

@@ -10,10 +10,7 @@
 """ Implemented classes for the different object type used by data grid """
 
 from abc import ABCMeta, abstractmethod
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
+from collections import OrderedDict
 import six
 from flask import render_template
 from flask_babelex import gettext

web/pgadmin/tools/sqleditor/tests/test_view_data_templates.py

@@ -12,15 +12,12 @@ import re
 
 from flask import Flask, render_template
 from jinja2 import FileSystemLoader
+from collections import OrderedDict
 
 from pgadmin import VersionedTemplateLoader
 from pgadmin.utils.route import BaseTestGenerator
 from pgadmin.utils.driver import get_driver
 from config import PG_DEFAULT_DRIVER
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
 
 
 class TestViewDataTemplates(BaseTestGenerator):

web/pgadmin/tools/sqleditor/utils/is_query_resultset_updatable.py

@@ -23,10 +23,8 @@
 """
 from flask import render_template
 from flask_babelex import gettext
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
+from collections import OrderedDict
+
 from pgadmin.tools.sqleditor.utils.get_column_types import get_columns_types
 
 

web/pgadmin/tools/sqleditor/utils/save_changed_data.py

@@ -8,11 +8,9 @@
 ##########################################################################
 
 from flask import render_template
+from collections import OrderedDict
+
 from pgadmin.tools.sqleditor.utils.constant_definition import TX_STATUS_IDLE
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
 
 
 def save_changed_data(changed_data, columns_info, conn, command_obj,