Improve Py3 support (#48)

 Improve support for Python 3

Author: MrSaints

eav/__init__.py

@@ -27,9 +27,9 @@ def get_version():
 __version__ = get_version()
 
 def register(model_cls, config_cls=None):
-    from registry import Registry
+    from .registry import Registry
     Registry.register(model_cls, config_cls)
 
 def unregister(model_cls):
-    from registry import Registry
+    from .registry import Registry
     Registry.unregister(model_cls)

eav/admin.py

@@ -41,7 +41,7 @@ def render_change_form(self, request, context, add=False, change=False, form_url
         form = context['adminform'].form
 
         # infer correct data from the form
-        fieldsets = self.fieldsets or [(None, {'fields': form.fields.keys()})]
+        fieldsets = self.fieldsets or [(None, {'fields': list(form.fields.keys())})]
         adminform = admin.helpers.AdminForm(form, fieldsets,
                                       self.prepopulated_fields)
         media = mark_safe(self.media + adminform.media)
@@ -91,7 +91,7 @@ def get_fieldsets(self, request, obj=None):
         instance = self.model(**kw)
         form = formset.form(request.POST, instance=instance)
 
-        return [(None, {'fields': form.fields.keys()})]
+        return [(None, {'fields': list(form.fields.keys())})]
 
 class AttributeAdmin(ModelAdmin):
     list_display = ('name', 'content_type', 'slug', 'datatype', 'description', 'site')

eav/managers.py

@@ -25,6 +25,8 @@
 Functions and Classes
 ---------------------
 '''
+import six
+
 from functools import wraps
 
 from django.db import models
@@ -49,7 +51,7 @@ def wrapper(self, *args, **kwargs):
             new_args.append(arg)
 
         new_kwargs = {}
-        for key, value in kwargs.items():
+        for key, value in list(kwargs.items()):
             # modify kwargs (warning: recursion ahead)
             new_key, new_value = expand_eav_filter(self.model, key, value)
             new_kwargs.update({new_key: new_value})
@@ -166,15 +168,15 @@ def create(self, **kwargs):
 
         new_kwargs = {}
         eav_kwargs = {}
-        for key, value in kwargs.iteritems():
+        for key, value in six.iteritems(kwargs):
             if key.startswith(prefix):
                 eav_kwargs.update({key[len(prefix):]: value})
             else:
                 new_kwargs.update({key: value})
 
         obj = self.model(**new_kwargs)
         obj_eav = getattr(obj, config_cls.eav_attr)
-        for key, value in eav_kwargs.iteritems():
+        for key, value in six.iteritems(eav_kwargs):
             setattr(obj_eav, key, value)
         obj.save()
         return obj

eav/models.py

@@ -32,6 +32,7 @@
 Classes
 -------
 '''
+from builtins import object
 
 
 from django.utils import timezone
@@ -151,7 +152,7 @@ class Attribute(models.Model):
                  change it's datatype.
     '''
 
-    class Meta:
+    class Meta(object):
         ordering = ['content_type', 'name']
         unique_together = ('site', 'content_type', 'slug')
 

eav/registry.py

@@ -26,6 +26,7 @@
 Classes
 -------
 '''
+from builtins import object
 
 from django.db.utils import DatabaseError
 from django.db.models.signals import pre_init, post_init, pre_save, post_save

eav/tests/misc_models.py

@@ -1,3 +1,4 @@
+from builtins import str
 from django.test import TestCase
 
 from ..models import EnumGroup, Attribute, Value
@@ -11,7 +12,7 @@ class MiscModels(TestCase):
     def test_enumgroup_unicode(self):
         name = 'Yes / No'
         e = EnumGroup.objects.create(name=name)
-        self.assertEqual(unicode(e), name)
+        self.assertEqual(str(e), name)
 
     def test_attribute_help_text(self):
         desc = 'Patient Age'

eav/tests/models.py

@@ -1,8 +1,9 @@
+from builtins import object
 from django.db import models
 from ..decorators import register_eav
 
 class Patient(models.Model):
-    class Meta:
+    class Meta(object):
         app_label = 'eav'
 
     name = models.CharField(max_length=12)
@@ -11,7 +12,7 @@ def __unicode__(self):
         return self.name
 
 class Encounter(models.Model):
-    class Meta:
+    class Meta(object):
         app_label = 'eav'
 
     num = models.PositiveSmallIntegerField()
@@ -22,7 +23,7 @@ def __unicode__(self):
 
 @register_eav()
 class ExampleModel(models.Model):
-    class Meta:
+    class Meta(object):
         app_label = 'eav'
 
     name = models.CharField(max_length=12)

eav/validators.py

@@ -44,7 +44,7 @@ def validate_text(value):
     '''
     Raises ``ValidationError`` unless *value* type is ``str`` or ``unicode``
     '''
-    if not (type(value) == unicode or type(value) == str):
+    if not (type(value) == str or type(value) == str):
         raise ValidationError(_(u"Must be str or unicode"))
 
 

setup.py

@@ -23,7 +23,7 @@
     version=__import__('eav').__version__,
     license = 'GNU Lesser General Public License (LGPL), Version 3',
 
-    requires = ['python (>= 2.5)', 'django (>= 1.2)'],
+    requires = ['python (>= 2.5)', 'django (>= 1.2)', 'six'],
     provides = ['eav'],
 
     description='Entity-attribute-value model implementation as a reusable'