Skip to content

Commit

Permalink
Merge 4763b14 into 337c05f
Browse files Browse the repository at this point in the history
  • Loading branch information
msabramo committed Feb 10, 2015
2 parents 337c05f + 4763b14 commit b94ab33
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions httpie/compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@
# noinspection PyUnresolvedReferences
from requests.compat import is_windows, bytes, str, is_py3, is_py26

try:
try: # pragma: no cover
# noinspection PyUnresolvedReferences,PyCompatibility
from urllib.parse import urlsplit
except ImportError:
except ImportError: # pragma: no cover
# noinspection PyUnresolvedReferences,PyCompatibility
from urlparse import urlsplit

try:
try: # pragma: no cover
# noinspection PyCompatibility
from urllib.request import urlopen
except ImportError:
except ImportError: # pragma: no cover
# noinspection PyCompatibility
from urllib2 import urlopen

try:
try: # pragma: no cover
from collections import OrderedDict
except ImportError:
except ImportError: # pragma: no cover
# Python 2.6 OrderedDict class, needed for headers, parameters, etc .###
# <https://pypi.python.org/pypi/ordereddict/1.1>
# noinspection PyCompatibility
Expand Down

0 comments on commit b94ab33

Please sign in to comment.