diff --git a/sickbeard/config.py b/sickbeard/config.py index b43aa65d330c420bfe1b57810ef655769b60b1ed..60a53756012661e0ff9d45cf49c1618aae8ec364 100644 --- a/sickbeard/config.py +++ b/sickbeard/config.py @@ -511,7 +511,7 @@ def check_setting_str(config, cfg_name, item_name, def_val, silent=True, censor_ config[cfg_name] = {} config[cfg_name][item_name] = helpers.encrypt(my_val, encryption_version) - if censor_log or (cfg_name, item_name) in logger.censoredItems.items(): + if censor_log or (cfg_name, item_name) in logger.censoredItems.iteritems(): logger.censoredItems[cfg_name, item_name] = my_val if not silent: diff --git a/sickbeard/databases/mainDB.py b/sickbeard/databases/mainDB.py index 2c9aefbc7ae3a992cb5c410ce8ee803cac8fbccd..2742bc70bf916ddd7f79dcf58a183a5a86198d93 100644 --- a/sickbeard/databases/mainDB.py +++ b/sickbeard/databases/mainDB.py @@ -162,7 +162,7 @@ class MainSanityCheck(db.DBSanityCheck): '': 'Unknown', } - for old_status, new_status in status_map.items(): + for old_status, new_status in status_map.iteritems(): self.connection.action("UPDATE tv_shows SET status = ? WHERE LOWER(status) = ?", [new_status, old_status]) def fix_episode_statuses(self): diff --git a/sickbeard/logger.py b/sickbeard/logger.py index f5e0d92ffbbda5e0fd300a9ff53922cd24fe0155..b991c9f6be4e3e7c30b5189c03709f4e819bb0bb 100644 --- a/sickbeard/logger.py +++ b/sickbeard/logger.py @@ -58,7 +58,7 @@ class CensoredFormatter(logging.Formatter, object): def format(self, record): msg = super(CensoredFormatter, self).format(record) - for k, v in censoredItems.items(): + for k, v in censoredItems.iteritems(): if v and len(v) > 0 and v in msg: msg = msg.replace(v, len(v) * '*') # Needed because Newznab apikey isn't stored as key=value in a section. diff --git a/sickbeard/name_cache.py b/sickbeard/name_cache.py index eefa235285508082b4d69ce997915c7c1ae27c88..a349a8da6589ffc4a5521f634501c77b03e144d8 100644 --- a/sickbeard/name_cache.py +++ b/sickbeard/name_cache.py @@ -77,7 +77,7 @@ def clearCache(indexerid=0): def saveNameCacheToDb(): cacheDB = db.DBConnection('cache.db') - for name, indexer_id in nameCache.items(): + for name, indexer_id in nameCache.iteritems(): cacheDB.action("INSERT OR REPLACE INTO scene_names (indexer_id, name) VALUES (?, ?)", [indexer_id, name]) diff --git a/sickbeard/notifiers/plex.py b/sickbeard/notifiers/plex.py index c67aa8f119dbed59dd70dcf551471e748ad874ad..de496dfef0211a8b4e526c6f2f835b8903f663e1 100644 --- a/sickbeard/notifiers/plex.py +++ b/sickbeard/notifiers/plex.py @@ -258,7 +258,7 @@ class PLEXNotifier: hosts_try = (hosts_all.copy(), hosts_match.copy())[len(hosts_match)] host_list = [] - for section_key, cur_host in hosts_try.items(): + for section_key, cur_host in hosts_try.iteritems(): url = 'http://%s/library/sections/%s/refresh%s' % (cur_host, section_key, token_arg) try: diff --git a/sickbeard/providers/btn.py b/sickbeard/providers/btn.py index 3bbab68f48389d69409053de284aad35c1e90613..5470838b4dbe407df2e252fc54d02576a870a32d 100644 --- a/sickbeard/providers/btn.py +++ b/sickbeard/providers/btn.py @@ -353,7 +353,7 @@ class BTNProvider(generic.TorrentProvider): else: items[quality].append(item) - itemList = list(itertools.chain(*[v for (k, v) in sorted(items.items(), reverse=True)])) + itemList = list(itertools.chain(*[v for (k, v) in sorted(items.iteritems(), reverse=True)])) itemList += itemsUnknown if itemsUnknown else [] # filter results diff --git a/sickbeard/providers/generic.py b/sickbeard/providers/generic.py index 86398aa4c378cdb90cb62dbec35617e4b61ec522..1188a369899a40adfca0fc074069ef6ebae31928 100644 --- a/sickbeard/providers/generic.py +++ b/sickbeard/providers/generic.py @@ -375,7 +375,7 @@ class GenericProvider: else: items[quality].append(item) - itemList = list(itertools.chain(*[v for (k, v) in sorted(items.items(), reverse=True)])) + itemList = list(itertools.chain(*[v for (k, v) in sorted(items.iteritems(), reverse=True)])) itemList += itemsUnknown if itemsUnknown else [] # filter results diff --git a/sickbeard/providers/iptorrents.py b/sickbeard/providers/iptorrents.py index 485459f3acbac95d36cf837b1583b663200d9b44..f2574442a79669e0db2c7008ca1d3d3912954cc0 100644 --- a/sickbeard/providers/iptorrents.py +++ b/sickbeard/providers/iptorrents.py @@ -186,7 +186,7 @@ class IPTorrentsProvider(generic.TorrentProvider): else: items[quality].append(item) - itemList = list(itertools.chain(*[v for (k, v) in sorted(items.items(), reverse=True)])) + itemList = list(itertools.chain(*[v for (k, v) in sorted(items.iteritems(), reverse=True)])) itemList += itemsUnknown if itemsUnknown else [] # filter results diff --git a/sickbeard/providers/newznab.py b/sickbeard/providers/newznab.py index 4d5d608566938fcfef76bfed22c727c364e4ad5d..58206969fb4e2b308454fbfcefc000c84cbf7c2a 100644 --- a/sickbeard/providers/newznab.py +++ b/sickbeard/providers/newznab.py @@ -107,9 +107,9 @@ class NewznabProvider(generic.NZBProvider): data = self.cache.getRSSFeed("%s/api?%s" % (self.url, urllib.urlencode(params))) except: logger.log(u"Error getting html for [%s]" % - ("%s/api?%s" % (self.url, '&'.join("%s=%s" % (x,y) for x,y in params.items())) ), logger.DEBUG) + ("%s/api?%s" % (self.url, '&'.join("%s=%s" % (x,y) for x,y in params.iteritems())) ), logger.DEBUG) return (False, return_categories, "Error getting html for [%s]" % - ("%s/api?%s" % (self.url, '&'.join("%s=%s" % (x,y) for x,y in params.items()) ))) + ("%s/api?%s" % (self.url, '&'.join("%s=%s" % (x,y) for x,y in params.iteritems()) ))) if not self._checkAuthFromData(data): logger.log(u"Error parsing xml for [%s]" % (self.name), logger.DEBUG) diff --git a/sickbeard/searchBacklog.py b/sickbeard/searchBacklog.py index 4f1c870d110a421b6688513ffa16b66801851f90..0c36135bb080712f271c0235a726857bdd07cd1e 100644 --- a/sickbeard/searchBacklog.py +++ b/sickbeard/searchBacklog.py @@ -99,7 +99,7 @@ class BacklogSearcher: segments = self._get_segments(curShow, fromDate) - for season, segment in segments.items(): + for season, segment in segments.iteritems(): self.currentSearchInfo = {'title': curShow.name + " Season " + str(season)} backlog_queue_item = search_queue.BacklogQueueItem(curShow, segment) diff --git a/sickbeard/tv.py b/sickbeard/tv.py index 57306807dfb86ce2c5cfaf21e75eae72ab595c8a..08837d699e9d02b2019efba16d788c753c492555 100644 --- a/sickbeard/tv.py +++ b/sickbeard/tv.py @@ -965,7 +965,7 @@ class TVShow(object): # Rename dict keys without spaces for DB upsert self.imdb_info = dict( - (k.replace(' ', '_'), k(v) if hasattr(v, 'keys') else v) for k, v in imdb_info.items()) + (k.replace(' ', '_'), k(v) if hasattr(v, 'keys') else v) for k, v in imdb_info.iteritems()) logger.log(str(self.indexerid) + u": Obtained info from IMDb ->" + str(self.imdb_info), logger.DEBUG) def nextEpisode(self): @@ -1522,7 +1522,7 @@ class TVEpisode(object): # rename the subtitles if needed if create_link: - for video, subs in foundSubs.items(): + for video, subs in foundSubs.iteritems(): for sub in subs: path = subliminal.subtitle.get_subtitle_path(video.name, sub.language if sickbeard.SUBTITLES_MULTI else None) if subs_new_path: @@ -1555,7 +1555,7 @@ class TVEpisode(object): (self.show.indexerid, self.season, self.episode), logger.DEBUG) if sickbeard.SUBTITLES_HISTORY: - for video, subs in foundSubs.items(): + for video, subs in foundSubs.iteritems(): for sub in subs: logger.log(u'history.logSubtitle %s, %s' % (sub.provider_name, sub.language.alpha3), logger.DEBUG) history.logSubtitle(self.show.indexerid, self.season, self.episode, self.status, sub) diff --git a/sickbeard/webapi.py b/sickbeard/webapi.py index 0c62e0d4c7e72a95cd060ffaece781774df2abd2..c3c0eba0edd92afbd5ba2dc612b0f58168a113a8 100644 --- a/sickbeard/webapi.py +++ b/sickbeard/webapi.py @@ -85,7 +85,7 @@ class ApiHandler(RequestHandler): def get(self, *args, **kwargs): kwargs = self.request.arguments - for arg, value in kwargs.items(): + for arg, value in kwargs.iteritems(): if len(value) == 1: kwargs[arg] = value[0] @@ -1025,7 +1025,7 @@ class CMD_EpisodeSetStatus(ApiCall): extra_msg = "" if start_backlog: - for season, segment in segments.items(): + for season, segment in segments.iteritems(): cur_backlog_queue_item = search_queue.BacklogQueueItem(showObj, segment) sickbeard.searchQueueScheduler.action.add_item(cur_backlog_queue_item) # @UndefinedVariable diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index d769133549867c3dc0de7f4714d80faec068e3f2..5a608c41f7e66e12abfa08190a46bd29736610bd 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -262,7 +262,7 @@ class WebHandler(BaseHandler): def async_call(self, function): try: kwargs = self.request.arguments - for arg, value in kwargs.items(): + for arg, value in kwargs.iteritems(): if len(value) == 1: kwargs[arg] = value[0] @@ -1784,7 +1784,7 @@ class Home(WebRoot): msg = "Backlog was automatically started for the following seasons of <b>" + showObj.name + "</b>:<br />" msg += '<ul>' - for season, segment in segments.items(): + for season, segment in segments.iteritems(): cur_backlog_queue_item = search_queue.BacklogQueueItem(showObj, segment) sickbeard.searchQueueScheduler.action.add_item(cur_backlog_queue_item) @@ -1803,7 +1803,7 @@ class Home(WebRoot): msg = "Retrying Search was automatically started for the following season of <b>" + showObj.name + "</b>:<br />" msg += '<ul>' - for season, segment in segments.items(): + for season, segment in segments.iteritems(): cur_failed_queue_item = search_queue.FailedQueueItem(showObj, segment) sickbeard.searchQueueScheduler.action.add_item(cur_failed_queue_item) @@ -2235,7 +2235,7 @@ class HomeAddShows(Home): map(final_results.extend, ([[sickbeard.indexerApi(id).name, id, sickbeard.indexerApi(id).config["show_url"], int(show['id']), - show['seriesname'], show['firstaired']] for show in shows] for id, shows in results.items())) + show['seriesname'], show['firstaired']] for show in shows] for id, shows in results.iteritems())) lang_id = sickbeard.indexerApi().config['langabbv_to_id'][lang] return json.dumps({'results': final_results, 'langid': lang_id})