File tree 3 files changed +16
-10
lines changed 3 files changed +16
-10
lines changed Original file line number Diff line number Diff line change 4
4
from __future__ import print_function
5
5
import pkgutil
6
6
__version__ = pkgutil .get_data (__package__ , 'VERSION' ).strip ()
7
+ if not isinstance (__version__ , str ):
8
+ __version__ = __version__ .decode ('ascii' )
7
9
version_info = tuple (__version__ .split ('.' )[:3 ])
8
10
9
11
import sys , os , warnings
Original file line number Diff line number Diff line change 14
14
from collections import defaultdict
15
15
from time import time
16
16
from operator import itemgetter
17
- from types import NoneType
17
+
18
+ NoneType = type (None )
18
19
19
20
live_refs = defaultdict (weakref .WeakKeyDictionary )
20
21
Original file line number Diff line number Diff line change 1
- from urlparse import urlparse
1
+ import sys
2
2
3
- # workaround for http://bugs.python.org/issue7904 - Python < 2.7
4
- if urlparse ('s3://bucket/key' ).netloc != 'bucket' :
5
- from urlparse import uses_netloc
6
- uses_netloc .append ('s3' )
3
+ if sys .version_info [0 ] == 2 :
4
+ from urlparse import urlparse
7
5
8
- # workaround for http://bugs.python.org/issue9374 - Python < 2.7.4
9
- if urlparse ('s3://bucket/key?key=value' ).query != 'key=value' :
10
- from urlparse import uses_query
11
- uses_query .append ('s3' )
6
+ # workaround for http://bugs.python.org/issue7904 - Python < 2.7
7
+ if urlparse ('s3://bucket/key' ).netloc != 'bucket' :
8
+ from urlparse import uses_netloc
9
+ uses_netloc .append ('s3' )
10
+
11
+ # workaround for http://bugs.python.org/issue9374 - Python < 2.7.4
12
+ if urlparse ('s3://bucket/key?key=value' ).query != 'key=value' :
13
+ from urlparse import uses_query
14
+ uses_query .append ('s3' )
You can’t perform that action at this time.
0 commit comments