diff --git a/core/autoProcess/autoProcessMovie.py b/core/autoProcess/autoProcessMovie.py index d488640a..200d2653 100644 --- a/core/autoProcess/autoProcessMovie.py +++ b/core/autoProcess/autoProcessMovie.py @@ -200,7 +200,7 @@ class autoProcessMovie(object): release_status_old = None if release: try: - release_id = release.keys()[0] + release_id = list(release.keys())[0] media_id = release[release_id]['media_id'] download_id = release[release_id]['download_info']['id'] downloader = release[release_id]['download_info']['downloader'] @@ -418,7 +418,7 @@ class autoProcessMovie(object): release = None if release: try: - release_id = release.keys()[0] + release_id = list(release.keys())[0] title = release[release_id]['title'] release_status_new = release[release_id]['status'] if release_status_old is None: # we didn't have a release before, but now we do. diff --git a/core/nzbToMediaDB.py b/core/nzbToMediaDB.py index 790f1a57..bf7211fb 100644 --- a/core/nzbToMediaDB.py +++ b/core/nzbToMediaDB.py @@ -178,18 +178,19 @@ class DBConnection(object): table=tableName, params=", ".join(genParams(valueDict)), conditions=" AND ".join(genParams(keyDict))), - valueDict.values() + keyDict.values() + list(valueDict.values()) + list(keyDict.values()) ) if self.connection.total_changes == changesBefore: + items = list(valueDict.values()) + list(keyDict.values()) self.action( "INSERT OR IGNORE INTO {table} ({columns}) " "VALUES ({values})".format( table=tableName, - columns=", ".join(valueDict.keys() + keyDict.keys()), - values=", ".join(["?"] * len(valueDict.keys() + keyDict.keys())) - ) - , valueDict.values() + keyDict.values() + columns=", ".join(items), + values=", ".join(["?"] * len(items)) + ), + items, ) def tableInfo(self, tableName):