diff --git a/CHANGES.md b/CHANGES.md index 2ebc9b22..28f811c6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -51,6 +51,7 @@ [develop changelog] * Update Requests library 2.7.0 (ab1f493) to 2.7.0 (8b5e457) * Update Tornado webserver from 4.2.dev1 (609dbb9) to 4.2b1 (61a16c9) +* Change reload_module call to explicit import lib/six.moves ### 0.9.1 (2015-05-25 03:03:00 UTC) diff --git a/SickBeard.py b/SickBeard.py index f50cac3e..8bf57a26 100755 --- a/SickBeard.py +++ b/SickBeard.py @@ -49,7 +49,7 @@ except: sys.exit(1) sys.path.insert(1, os.path.abspath(os.path.join(os.path.dirname(__file__), 'lib'))) -from six.moves import reload_module +from lib.six import moves # We only need this for compiling an EXE and I will just always do that on 2.6+ if sys.hexversion >= 0x020600F0: @@ -141,7 +141,7 @@ class SickGear(object): sickbeard.SYS_ENCODING = 'UTF-8' if not hasattr(sys, 'setdefaultencoding'): - reload_module(sys) + moves.reload_module(sys) try: # pylint: disable=E1101 diff --git a/sickbeard/network_timezones.py b/sickbeard/network_timezones.py index b5eeec4f..5eb15fe0 100644 --- a/sickbeard/network_timezones.py +++ b/sickbeard/network_timezones.py @@ -26,8 +26,7 @@ from os.path import basename, join, isfile import os import re import datetime -from six import iteritems -from six.moves import reload_module +from lib.six import iteritems, moves # regex to parse time (12/24 hour format) time_regex = re.compile(r'(\d{1,2})(([:.](\d{2,2}))? ?([PA][. ]? ?M)|[:.](\d{2,2}))\b', flags=re.IGNORECASE) @@ -127,7 +126,7 @@ def _update_zoneinfo(): # rename downloaded file ek.ek(os.rename, zonefile_tmp, zonefile) # load the new zoneinfo - reload_module(lib.dateutil.zoneinfo) + moves.reload_module(lib.dateutil.zoneinfo) sb_timezone = tz.tzlocal() except: _remove_zoneinfo_failed(zonefile_tmp)