moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-12-12 11:02:21 -05:00
Code Issues Releases Wiki Activity

Fix for sickragetv/sickrage-issues#247

Browse Source
This commit is contained in:
echel0n 2014-12-21 09:28:20 -08:00
parent 60e97fb3cc
commit b667c722f2
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sickbeard/db.py
View File

@ -73,18 +73,9 @@ class DBConnection(object):
raise raise
def _execute(self, query, args): def _execute(self, query, args):
def convert(x):
if isinstance(x, basestring):
try:
x = unicode(x).decode(sickbeard.SYS_ENCODING)
except:
pass
return x
try: try:
if not args: if not args:
return self.connection.cursor().execute(query) return self.connection.cursor().execute(query)
# args = map(convert, args)
return self.connection.cursor().execute(query, args) return self.connection.cursor().execute(query, args)
except Exception as e: except Exception as e:
raise e raise e
@ -238,7 +229,10 @@ class DBConnection(object):
return columns return columns
def _unicode_text_factory(self, x): def _unicode_text_factory(self, x):
try:
return unicode(x, 'utf-8') return unicode(x, 'utf-8')
except:
return unicode(x, sickbeard.SYS_ENCODING)
def _dict_factory(self, cursor, row): def _dict_factory(self, cursor, row):
d = {} d = {}