openstack/glance
Code Issues Proposed changes

Remove ordereddict from requirements

Browse Source 
Ordereddict was required for py26 support. Since we have
dropped support for py26 (we are no longer gating on it) we
should remove it as a requirement and remove references
to it in the code.

Change-Id: I648edbb5d0b51c003f08f5f5c4ce700128032b38
Partial-bug: 1445827
This commit is contained in:
Stuart McLaren 2015-04-20 12:28:33 +00:00
parent 00d84d1a27
commit 20ec82f18c
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glance/common/property_utils.py
View File

@ -12,12 +12,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from collections import OrderedDict
import ConfigParser import ConfigParser
import re import re
try:
from collections import OrderedDict
except ImportError:
from ordereddict import OrderedDict
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging

5
glance/common/swift_store_utils.py
View File

@ -12,11 +12,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from collections import OrderedDict
import ConfigParser import ConfigParser
try:
from collections import OrderedDict
except ImportError:
from ordereddict import OrderedDict
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging

1
requirements.txt
View File

@ -21,7 +21,6 @@ httplib2>=0.7.5
kombu>=2.5.0 kombu>=2.5.0
pycrypto>=2.6 pycrypto>=2.6
iso8601>=0.1.9 iso8601>=0.1.9
ordereddict
oslo.config>=1.9.3,<1.10.0 # Apache-2.0 oslo.config>=1.9.3,<1.10.0 # Apache-2.0
oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0 oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0
oslo.context>=0.2.0,<0.3.0 # Apache-2.0 oslo.context>=0.2.0,<0.3.0 # Apache-2.0