|
28 | 28 | if sys.version_info >= (3,): |
29 | 29 | from urllib.parse import urlparse |
30 | 30 | from urllib.request import urlopen, FancyURLopener |
| 31 | + import urllib.request |
31 | 32 | else: |
32 | 33 | from urllib import urlopen, FancyURLopener |
33 | 34 | from urlparse import urlparse |
@@ -590,7 +591,10 @@ def fetch_files_to_be_fetched(self): |
590 | 591 | """ |
591 | 592 | Fetches files from the fetch.txt |
592 | 593 | """ |
593 | | - urllib._urlopener = BagFetcherURLOpener # pylint: disable=protected-access |
| 594 | + if sys.version_info >= (3,): |
| 595 | + urllib.request._urlopener = BagFetcherURLOpener() # pylint: disable=protected-access |
| 596 | + else: |
| 597 | + urllib._urlopener = BagFetcherURLOpener() # pylint: disable=protected-access |
594 | 598 | for url, expected_size, filename in self.fetch_entries(): |
595 | 599 | expected_size = int(expected_size) # FIXME should be int in the first place |
596 | 600 | if filename in self.payload_files(): |
@@ -974,7 +978,7 @@ def _path_is_dangerous(self, path): |
974 | 978 | return not (common == bag_path) |
975 | 979 |
|
976 | 980 | class BagFetcherURLOpener(FancyURLopener): |
977 | | - version = "bagit.py/%s (Python/%s)" % (VERSION, sys.version) |
| 981 | + version = "bagit.py/%s (Python/%s)" % (VERSION, sys.version_info) |
978 | 982 |
|
979 | 983 | class BagError(Exception): |
980 | 984 | pass |
|
0 commit comments