diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py index 005442fb..f5ff3dfa 100644 --- a/sickbeard/__init__.py +++ b/sickbeard/__init__.py @@ -88,7 +88,6 @@ properFinderScheduler = None autoPostProcesserScheduler = None subtitlesFinderScheduler = None traktWatchListCheckerSchedular = None -updateRSSScheduler = None showList = None loadingShowList = None @@ -458,7 +457,7 @@ def initialize(consoleLogging=True): GUI_NAME, HOME_LAYOUT, HISTORY_LAYOUT, DISPLAY_SHOW_SPECIALS, COMING_EPS_LAYOUT, COMING_EPS_SORT, COMING_EPS_DISPLAY_PAUSED, COMING_EPS_MISSED_RANGE, DATE_PRESET, TIME_PRESET, TIME_PRESET_W_SECONDS, \ METADATA_WDTV, METADATA_TIVO, METADATA_MEDE8ER, IGNORE_WORDS, CALENDAR_UNPROTECTED, CREATE_MISSING_SHOW_DIRS, \ ADD_SHOWS_WO_DIR, USE_SUBTITLES, SUBTITLES_LANGUAGES, SUBTITLES_DIR, SUBTITLES_SERVICES_LIST, SUBTITLES_SERVICES_ENABLED, SUBTITLES_HISTORY, SUBTITLES_FINDER_FREQUENCY, subtitlesFinderScheduler, \ - USE_FAILED_DOWNLOADS, DELETE_FAILED, ANON_REDIRECT, LOCALHOST_IP, TMDB_API_KEY, DEBUG, PROXY_SETTING, updateRSSScheduler + USE_FAILED_DOWNLOADS, DELETE_FAILED, ANON_REDIRECT, LOCALHOST_IP, TMDB_API_KEY, DEBUG, PROXY_SETTING if __INITIALIZED__: return False @@ -1091,7 +1090,7 @@ def start(): def halt(): global __INITIALIZED__, backlogSearchScheduler, showUpdateScheduler, \ showQueueScheduler, properFinderScheduler, autoPostProcesserScheduler, searchQueueScheduler, \ - subtitlesFinderScheduler, updateRSSScheduler, dailySearchScheduler, started, \ + subtitlesFinderScheduler, dailySearchScheduler, started, \ traktWatchListCheckerSchedular with INIT_LOCK: diff --git a/sickbeard/tv.py b/sickbeard/tv.py index ec009272..d6014e89 100644 --- a/sickbeard/tv.py +++ b/sickbeard/tv.py @@ -881,9 +881,6 @@ class TVShow(object): for sqlEp in sqlResults: curEp = self.getEpisode(int(sqlEp["season"]), int(sqlEp["episode"])) foundEps.append(curEp) - - time.sleep(cpu_presets[sickbeard.CPU_PRESET]) - return foundEps def deleteShow(self): diff --git a/sickbeard/versionChecker.py b/sickbeard/versionChecker.py index 8dda1a50..62ca4763 100644 --- a/sickbeard/versionChecker.py +++ b/sickbeard/versionChecker.py @@ -405,7 +405,7 @@ class GitUpdateManager(UpdateManager): logger.log(u"Output doesn't look like a hash, not using it", logger.ERROR) return False self._cur_commit_hash = cur_commit_hash - sickbeard.CUR_COMMIT_HASH = cur_commit_hash + sickbeard.CUR_COMMIT_HASH = str(cur_commit_hash) return True else: return False