fixes minor bug in VersionField, add django-import-export due saxix#13

Author: saxix

concurrency/fields.py

@@ -31,6 +31,9 @@ def __init__(self, **kwargs):
     def get_default(self):
         return 0
 
+    def to_python(self, value):
+        return int(value)
+
     def validate(self, value, model_instance):
         pass
 
@@ -63,8 +66,8 @@ def get_internal_type(self):
         return "BigIntegerField"
 
     def pre_save(self, model_instance, add):
-        old_value = getattr(model_instance, self.attname) or 0
-        value = max(old_value + 1, (int(time.time() * 1000000) - OFFSET))
+        old_value = getattr(model_instance, self.attname, 0)
+        value = max(int(old_value )+ 1, (int(time.time() * 1000000) - OFFSET))
         setattr(model_instance, self.attname, value)
         return value
 
@@ -80,7 +83,7 @@ def get_internal_type(self):
         return "BigIntegerField"
 
     def pre_save(self, model_instance, add):
-        value = (getattr(model_instance, self.attname) or 0) + 1
+        value = int(getattr(model_instance, self.attname, 0)) + 1
         setattr(model_instance, self.attname, value)
         return value
 

demo/demoproject/demoapp/admin.py

@@ -1,7 +1,8 @@
+from import_export.admin import ImportExportMixin
 from concurrency.admin import ConcurrentModelAdmin
 
 
-class DemoModelAdmin(ConcurrentModelAdmin):
+class DemoModelAdmin(ImportExportMixin, ConcurrentModelAdmin):
     # list_display = [f.name for f in DemoModel._meta.fields]
     list_display = ('id', 'char', 'integer')
     list_display_links = ('id', )

demo/demoproject/settings.py

@@ -16,6 +16,7 @@
     'django.contrib.staticfiles',
     'django.contrib.admin',
     'concurrency',
+    'import_export',
     # 'demoproject.demoapp'
 )
 

requirements.pip

@@ -3,3 +3,4 @@ mock
 webtest
 django-webtest
 selenium
+django-import-export