- code clean and typos

- removed no-API ConcurrentModelAdmin
- 0.4c4

Author: saxix

concurrency/__init__.py

@@ -2,7 +2,7 @@
 import datetime
 import os
 
-VERSION = __version__ = (0, 4, 0, 'rc', 3)
+VERSION = __version__ = (0, 4, 0, 'rc', 4)
 __author__ = 'sax'
 
 

concurrency/admin.py

@@ -58,7 +58,10 @@ def __init__(self, value):
         self.value = value
 
     def __repr__(self):
-        return str(self.value)
+        if self.value:
+            return str(self.value)
+        else:
+            return ''
 
 
 class VersionField(forms.IntegerField):
@@ -87,7 +90,7 @@ def to_python(self, value):
             if value not in (None, '', 'None'):
                 return int(self._signer.unsign(value))
             return 0
-        except (BadSignature, ValueError) as e:
+        except (BadSignature, ValueError):
             raise SuspiciousOperation(_('Version number seems tampered'))
 
     def widget_attrs(self, widget):

concurrency/forms.py

@@ -5,8 +5,6 @@
 from concurrency.views import handler409
 
 
-
-# This middleware is still alpha and should not be used.
 class ConcurrencyMiddleware(object):
     def process_exception(self, request, exception):
         if isinstance(exception, RecordModifiedError):

concurrency/middleware.py

@@ -1,4 +1,5 @@
 from django.db.models.signals import class_prepared
 from concurrency.core import class_prepared_concurrency_handler
 
+
 class_prepared.connect(class_prepared_concurrency_handler, dispatch_uid='class_prepared_concurrency_handler')

concurrency/models.py

@@ -1,13 +1,10 @@
 # -*- coding: utf-8 -*-
-
-from django.utils.translation import gettext as _
 from concurrency.core import InconsistencyError
 from concurrency.tests import DjangoAdminTestCase, TestModel0, TestModelWithCustomSave
 
 
 class SettingsTest(DjangoAdminTestCase):
 
-
     def test_concurrecy_sanity_check(self):
         """
         Tests CONCURRECY_SANITY_CHECK settings

concurrency/tests/conf.py

@@ -8,7 +8,6 @@
 from django.core.urlresolvers import reverse
 from django.forms.models import modelform_factory
 from django.test import TestCase
-# from concurrency.tests.models import *
 from concurrency import forms
 from concurrency.forms import ConcurrentForm, VersionWidget, VersionFieldSigner
 from concurrency.tests import TestModel0, TestModel1
@@ -27,28 +26,26 @@
 
 class TestModel1Admin(admin.ModelAdmin):
     formfield_overrides = {
-        # VersionField: {'widget': VersionWidget},
         forms.VersionField: {'widget': VersionWidget()},
-        # IntegerVersionField: {'widget': VersionWidget},
-        # AutoIncVersionField: {'widget': VersionWidget},
     }
     form = modelform_factory(TestModel1, ConcurrentForm,
                              widgets={'version': VersionWidget()})
 
 
 class DjangoAdminTestCase(TestCase):
     urls = 'concurrency.tests.urls'
+    MIDDLEWARE_CLASSES = global_settings.MIDDLEWARE_CLASSES
+    AUTHENTICATION_BACKENDS = global_settings.AUTHENTICATION_BACKENDS
 
     def setUp(self):
         super(DjangoAdminTestCase, self).setUp()
         self.sett = self.settings(INSTALLED_APPS=INSTALLED_APPS,
-                                  MIDDLEWARE_CLASSES=global_settings.MIDDLEWARE_CLASSES,
-                                  AUTHENTICATION_BACKENDS=global_settings.AUTHENTICATION_BACKENDS,
+                                  MIDDLEWARE_CLASSES=self.MIDDLEWARE_CLASSES,
+                                  AUTHENTICATION_BACKENDS=self.AUTHENTICATION_BACKENDS,
                                   PASSWORD_HASHERS=('django.contrib.auth.hashers.MD5PasswordHasher',), # fastest hasher
                                   STATIC_URL='/static/',
                                   SOUTH_TESTS_MIGRATE=False,
                                   TEMPLATE_DIRS=(os.path.join(os.path.dirname(__file__), 'templates'),),
-                                  #            TEMPLATE_LOADERS = ('django.template.loaders.filesystem.Loader',)
                                   )
         self.sett.enable()
         django.core.management._commands = None # reset commands cache

concurrency/tests/contrib_admin.py

@@ -27,7 +27,7 @@ def test(self):
                              u'<input name="ver" type="hidden" value="100"/><div>100</div>')
 
 
-class FieldTest(SimpleTestCase):
+class FormFieldTest(SimpleTestCase):
 
     def setUp(self):
         self.save_warnings_state()
@@ -84,6 +84,18 @@ def test_signer(self):
         form = Form({'username': 'aaa'})
         self.assertTrue(form.is_valid(), form.non_field_errors())
 
+    def test_initial_value(self):
+        Form = modelform_factory(TestModel0, type('xxx', (ConcurrentForm,), {}))
+        form = Form({'username': 'aaa'})
+        self.assertHTMLEqual(str(form['version']), '<input type="hidden" value="" name="version" id="id_version" />')
+        self.assertTrue(form.is_valid(), form.non_field_errors())
+
+    def test_initial_value_with_custom_signer(self):
+        Form = modelform_factory(TestIssue3Model, type('xxx', (ConcurrentForm,), {'version': VersionField(signer=DummySigner())}))
+        form = Form({'username': 'aaa'})
+        self.assertHTMLEqual(str(form['version']), '<input type="hidden" value="" name="version" id="id_version" />')
+        self.assertTrue(form.is_valid(), form.non_field_errors())
+
     def test_tamperig(self):
         obj, __ = TestIssue3Model.objects.get_or_create(username='aaa')
         Form = modelform_factory(TestIssue3Model, ConcurrentForm)

concurrency/tests/forms.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from django.conf import global_settings
+import mock
 from django.core.urlresolvers import reverse
 from django.http import HttpRequest
 from django.test import TestCase
@@ -40,13 +40,12 @@ def test_process_exception(self):
 
 
 class CT(DjangoAdminTestCase):
+    MIDDLEWARE_CLASSES = ('django.middleware.common.CommonMiddleware',
+                          'django.contrib.sessions.middleware.SessionMiddleware',
+                          'django.contrib.auth.middleware.AuthenticationMiddleware',
+                          'concurrency.middleware.ConcurrencyMiddleware',)
 
-    def setUp(self):
-        DjangoAdminTestCase.setUp(self)
-        m = ['concurrency.middleware.ConcurrencyMiddleware'] + list(global_settings.MIDDLEWARE_CLASSES)
-        self.sett = self.settings(MIDDLEWARE_CLASSES= m)
-        self.sett.enable()
-
+    @mock.patch('django.core.signals.got_request_exception.send', mock.Mock())
     def test_stack(self):
         m, __ = TestModel0.objects.get_or_create(username="New", last_name="1")
         copy = TestModel0.objects.get(pk=m.pk)

concurrency/tests/middleware.py

@@ -5,8 +5,6 @@
 from django.template.context import RequestContext
 
 
-# This module is still alpha and should not be used.
-
 class ConflictResponse(HttpResponse):
     status_code = 409