[#4801] Consolidate usage of OrderedDict

Always import from collections. Remove from ckan.common

ckan/authz.py

@@ -3,7 +3,7 @@
 import functools
 import sys
 
-from collections import defaultdict
+from collections import defaultdict, OrderedDict
 from logging import getLogger
 
 import six
@@ -13,7 +13,7 @@
 
 import ckan.plugins as p
 import ckan.model as model
-from ckan.common import OrderedDict, _, c
+from ckan.common import _, c
 
 import ckan.lib.maintain as maintain
 

ckan/common.py

@@ -28,11 +28,6 @@
 
 current_app = flask.current_app
 
-try:
-    from collections import OrderedDict  # from python 2.7
-except ImportError:
-    from sqlalchemy.util import OrderedDict
-
 
 def is_flask_request():
     u'''

ckan/model/__init__.py

@@ -3,13 +3,10 @@
 import warnings
 import logging
 import re
-from datetime import datetime
 from time import sleep
 from os.path import splitext
 
-from six import text_type
 from sqlalchemy import MetaData, __version__ as sqav, Table
-from sqlalchemy.util import OrderedDict
 from sqlalchemy.exc import ProgrammingError
 
 from alembic.command import (

ckan/model/domain_object.py

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
 import datetime
+from collections import OrderedDict
 
 import sqlalchemy as sa
 from sqlalchemy import orm
-from sqlalchemy.util import OrderedDict
 
 from ckan.model import meta, core
 

ckan/model/resource.py

@@ -3,7 +3,7 @@
 import datetime
 
 from six import text_type
-from sqlalchemy.util import OrderedDict
+from collections import OrderedDict
 from sqlalchemy.ext.orderinglist import ordering_list
 from sqlalchemy import orm
 from ckan.common import config

ckan/views/group.py

@@ -2,11 +2,11 @@
 
 import logging
 import re
-from six.moves.urllib.parse import urlencode
-
+from collections import OrderedDict
 
 import six
 from six import string_types
+from six.moves.urllib.parse import urlencode
 
 import ckan.lib.base as base
 import ckan.lib.helpers as h
@@ -17,7 +17,7 @@
 import ckan.authz as authz
 import ckan.lib.plugins as lib_plugins
 import ckan.plugins as plugins
-from ckan.common import OrderedDict, g, config, request, _
+from ckan.common import g, config, request, _
 from flask import Blueprint
 from flask.views import MethodView
 

ckanext/datastore/backend/postgres.py

@@ -10,6 +10,7 @@
 import datetime
 import hashlib
 import json
+from collections import OrderedDict
 
 import six
 from six.moves.urllib.parse import (
@@ -31,7 +32,7 @@
 
 import ckan.model as model
 import ckan.plugins as plugins
-from ckan.common import config, OrderedDict
+from ckan.common import config
 
 from ckanext.datastore.backend import (
     DatastoreBackend,