github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-07-30 03:28:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix dict usage in Python 3

Browse source 
`KeysView` does not support indexing
'dict_values' does not support operand type `+`
This commit is contained in:
Labrys of Knossos 2018-12-15 16:43:14 -05:00
parent f744e6ea97
commit 943bdc9320
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/autoProcess/autoProcessMovie.py
View file

@ -200,7 +200,7 @@ class autoProcessMovie(object):
release_status_old = None release_status_old = None
if release: if release:
try: try:
release_id = release.keys()[0] release_id = list(release.keys())[0]
media_id = release[release_id]['media_id'] media_id = release[release_id]['media_id']
download_id = release[release_id]['download_info']['id'] download_id = release[release_id]['download_info']['id']
downloader = release[release_id]['download_info']['downloader'] downloader = release[release_id]['download_info']['downloader']
@ -418,7 +418,7 @@ class autoProcessMovie(object):
release = None release = None
if release: if release:
try: try:
release_id = release.keys()[0] release_id = list(release.keys())[0]
title = release[release_id]['title'] title = release[release_id]['title']
release_status_new = release[release_id]['status'] release_status_new = release[release_id]['status']
if release_status_old is None: # we didn't have a release before, but now we do. if release_status_old is None: # we didn't have a release before, but now we do.

11
core/nzbToMediaDB.py
View file

@ -178,18 +178,19 @@ class DBConnection(object):
table=tableName, table=tableName,
params=", ".join(genParams(valueDict)), params=", ".join(genParams(valueDict)),
conditions=" AND ".join(genParams(keyDict))), conditions=" AND ".join(genParams(keyDict))),
valueDict.values() + keyDict.values() list(valueDict.values()) + list(keyDict.values())
) )
if self.connection.total_changes == changesBefore: if self.connection.total_changes == changesBefore:
items = list(valueDict.values()) + list(keyDict.values())
self.action( self.action(
"INSERT OR IGNORE INTO {table} ({columns}) " "INSERT OR IGNORE INTO {table} ({columns}) "
"VALUES ({values})".format( "VALUES ({values})".format(
table=tableName, table=tableName,
columns=", ".join(valueDict.keys() + keyDict.keys()), columns=", ".join(items),
values=", ".join(["?"] * len(valueDict.keys() + keyDict.keys())) values=", ".join(["?"] * len(items))
) ),
, valueDict.values() + keyDict.values() items,
) )
def tableInfo(self, tableName): def tableInfo(self, tableName):