Skip to content

Commit

Permalink
Merge pull request #533 from ocefpaf/fix_ordereddict_import
Browse files Browse the repository at this point in the history
fix OrderedDict import on py27
  • Loading branch information
snorfalorpagus authored Jan 15, 2018
2 parents 2401c1a + 954fdc6 commit 8867328
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions fiona/compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@

if sys.version_info[0] >= 3:
from urllib.parse import urlparse
from collections import UserDict, OrderedDict
from collections import UserDict
else:
from urlparse import urlparse
from UserDict import UserDict
from ordereddict import OrderedDict

# Users can pass in objects that subclass a few different objects
# More specifically, rasterio has a CRS() class that subclasses UserDict()
# In Python 2 UserDict() is in its own module and does not subclass Mapping()
DICT_TYPES = (dict, collections.Mapping, UserDict)

0 comments on commit 8867328

Please sign in to comment.