From e7d317b38b653f1aabf2fefcdb6ea01d7c4d39d4 Mon Sep 17 00:00:00 2001
From: Friedrich Lindenberg <friedrich@pudo.org>
Date: Tue, 18 Feb 2014 13:08:06 +0100
Subject: [PATCH] Flakes are gone

---
 dataset/persistence/util.py | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/dataset/persistence/util.py b/dataset/persistence/util.py
index 2e0f39c..9a6b8fe 100644
--- a/dataset/persistence/util.py
+++ b/dataset/persistence/util.py
@@ -6,15 +6,6 @@ try:
 except ImportError:
     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
 
 
@@ -86,9 +77,9 @@ def sqlite_datetime_fix():
             return (value / 1000 - self.epoch).total_seconds()
 
         def process_result_value(self, value, dialect):
-            if isinstance(value, basestring):
-                return value
-            return self.epoch + timedelta(seconds=value / 1000)
+            if isinstance(value, int):
+                return self.epoch + timedelta(seconds=value / 1000)
+            return value
 
     def is_sqlite(inspector):
         return inspector.engine.dialect.name == "sqlite"