Flakes are gone

Browse Source
This commit is contained in:
Friedrich Lindenberg 2014-02-18 13:08:06 +01:00
parent 294ab81576
commit e7d317b38b
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dataset/persistence/util.py
View File

@ -6,15 +6,6 @@ try:
except ImportError: except ImportError:
from ordereddict import OrderedDict from ordereddict import OrderedDict
try:
unicode = unicode
except NameError:
# 'unicode' is undefined, must be Python 3
basestring = (str,bytes)
else:
# 'unicode' exists, must be Python 2
basestring = basestring
from sqlalchemy import Integer, UnicodeText, Float, DateTime, Boolean, types, Table, event from sqlalchemy import Integer, UnicodeText, Float, DateTime, Boolean, types, Table, event
@ -86,9 +77,9 @@ def sqlite_datetime_fix():
return (value / 1000 - self.epoch).total_seconds() return (value / 1000 - self.epoch).total_seconds()
def process_result_value(self, value, dialect): def process_result_value(self, value, dialect):
if isinstance(value, basestring): if isinstance(value, int):
return value return self.epoch + timedelta(seconds=value / 1000)
return self.epoch + timedelta(seconds=value / 1000) return value
def is_sqlite(inspector): def is_sqlite(inspector):
return inspector.engine.dialect.name == "sqlite" return inspector.engine.dialect.name == "sqlite"