Merge pull request #39 from alexei/feature/python3

Run 2to3

Author: alexei

adapters/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import
+
 
 from .adapters import *  # noqa
 from .fields import *  # noqa

adapters/adapters.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-from __future__ import absolute_import
+
+
 
 import collections
 import copy
@@ -28,7 +28,7 @@ def __init__(self, data=None, instance=None, *args, **kwargs):
     def fields(self):
         if not hasattr(self, '_fields'):
             self._fields = BindingDict(self)
-            for key, value in self.get_fields().iteritems():
+            for key, value in self.get_fields().items():
                 self._fields[key] = value
         return self._fields
 
@@ -37,7 +37,7 @@ def get_fields(self):
 
     def adapt(self, data=None):
         instance = self.get_instance()
-        for field_name, field in self.fields.iteritems():
+        for field_name, field in self.fields.items():
             value = field.get_attribute(data or self.data)
             if value is undefined:
                 continue

adapters/base.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-from __future__ import absolute_import
+
+
 
 from .helpers import get_attribute
 from .utils import undefined

adapters/fields.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
+
 
 import datetime
 import dateutil.parser
@@ -43,14 +43,14 @@ def adapt(self, data):
 
 class CharField(BaseField):
     def adapt(self, data):
-        return unicode(data)
+        return str(data)
 
 
 class DateField(BaseField):
     def adapt(self, data):
         if isinstance(data, datetime.date):
             return data
-        elif isinstance(data, (str, unicode)):
+        elif isinstance(data, str):
             return dateutil.parser.parse(data).date()
         else:
             raise ValueError("Invalid date argument")
@@ -60,7 +60,7 @@ class DateTimeField(BaseField):
     def adapt(self, data):
         if isinstance(data, datetime.datetime):
             return data
-        elif isinstance(data, (str, unicode)):
+        elif isinstance(data, str):
             return dateutil.parser.parse(data)
         else:
             raise ValueError("Invalid date argument")
@@ -89,7 +89,7 @@ class TimeField(BaseField):
     def adapt(self, data):
         if isinstance(data, datetime.time):
             return data
-        elif isinstance(data, (str, unicode)):
+        elif isinstance(data, str):
             return dateutil.parser.parse(data).timetz()
         else:
             raise ValueError("Invalid time argument")

adapters/helpers.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-from __future__ import absolute_import
+
+
 
 import collections
 
@@ -26,7 +26,7 @@ def get_attribute(obj, attrs):
         except Exception:
             return undefined
 
-        if callable(obj):
+        if isinstance(obj, collections.Callable):
             obj = obj()
 
     return obj

adapters/meta.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-from __future__ import absolute_import
+
+
 
 import collections
 
@@ -15,7 +15,7 @@ class AdapterMetaClass(type):
     def __new__(meta, name, bases, attrs):
         fields = [
             (key, attrs.pop(key))
-            for key in attrs.keys() if isinstance(attrs[key], BaseField)
+            for key in list(attrs.keys()) if isinstance(attrs[key], BaseField)
         ]
 
         for base in reversed(bases):

tests/fixtures.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 import adapters
 
 

tests/test_adapter.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 import unittest
 
 import fixtures

tests/test_fields.py

@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
-
 import datetime
 from decimal import Decimal
 import unittest