- new VersioError Exception

- fixed tampered with error message
- merge master

Author: saxix

concurrency/__init__.py

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

concurrency/exceptions.py

@@ -1,4 +1,5 @@
-from django.core.exceptions import ValidationError
+from django.core.exceptions import ValidationError, SuspiciousOperation
+from django.utils.translation import ugettext as _
 from django.db import DatabaseError
 
 
@@ -14,3 +15,8 @@ def __init__(self, *args, **kwargs):
 
 class InconsistencyError(DatabaseError):
     pass
+
+
+class VersionError(SuspiciousOperation):
+    def __init__(self, message=None, code=None, params=None):
+        self.message = message or _("Version number is missing or has been tampered with")

concurrency/forms.py

@@ -7,6 +7,7 @@
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _
 from concurrency.core import _select_lock, RecordModifiedError
+from concurrency.exceptions import VersionError
 
 
 class ConcurrentForm(ModelForm):
@@ -91,7 +92,7 @@ def to_python(self, value):
                 return int(self._signer.unsign(value))
             return 0
         except (BadSignature, ValueError):
-            raise SuspiciousOperation(_('Version number seems tampered'))
+            raise VersionError()
 
     def widget_attrs(self, widget):
         return {}

concurrency/tests/forms.py

@@ -5,6 +5,7 @@
 from django.utils.encoding import smart_str
 from django.test import TestCase
 from concurrency.core import InconsistencyError
+from concurrency.exceptions import VersionError
 from concurrency.forms import ConcurrentForm, VersionField, VersionFieldSigner, VersionWidget
 from concurrency.tests import TestModel0, TestIssue3Model
 from django.test.testcases import SimpleTestCase
@@ -44,23 +45,17 @@ def test_with_dummy_signer(self):
         self.assertEqual(1, f.clean('1'))
         self.assertEqual(0, f.clean(None))
         self.assertEqual(0, f.clean(''))
-        self.assertRaisesMessage(SuspiciousOperation,
-                                "Version number seems tampered", f.clean, 'aa:bb')
-        self.assertRaisesMessage(SuspiciousOperation,
-                                 "Version number seems tampered", f.clean, 1.5)
+        self.assertRaises(VersionError, f.clean, 'aa:bb')
+        self.assertRaises(VersionError, f.clean, 1.5)
 
     def test(self):
         f = VersionField()
         self.assertEqual(1, f.clean(VersionFieldSigner().sign(1)))
         self.assertEqual(1, f.clean(VersionFieldSigner().sign('1')))
         self.assertEqual(0, f.clean(None))
         self.assertEqual(0, f.clean(''))
-        self.assertRaisesMessage(SuspiciousOperation,
-                                "Version number seems tampered", f.clean, '100')
-        self.assertRaisesMessage(SuspiciousOperation,
-                                 "Version number seems tampered",
-                                 f.clean,
-                                 VersionFieldSigner().sign(1.5))
+        self.assertRaises(VersionError, f.clean, '100')
+        self.assertRaises(VersionError, f.clean, VersionFieldSigner().sign(1.5))
 
 
 class ConcurrentFormTest(TestCase):