django 1.5.1 compat and test fix

Author: saxix

concurrency/admin.py

@@ -198,7 +198,7 @@ def message_user(self, request, message, **kwargs):
         opts = self.model._meta
         if self._concurrency_list_editable_errors:
             names = force_unicode(opts.verbose_name), force_unicode(opts.verbose_name_plural)
-            pattern = ur"(?P<num>\d+) ({0}|{1})".format(*names)
+            pattern = r"(?P<num>\d+) ({0}|{1})".format(*names)
             rex = re.compile(pattern)
             m = rex.match(message)
             concurrency_errros = len(self._concurrency_list_editable_errors)

concurrency/tests/admin_list_editable.py

@@ -1,8 +1,11 @@
 # -*- coding: utf-8 -*-
-from concurrency.tests.base import AdminTestCase, SENTINEL
-from concurrency.tests.models import ListEditableConcurrentModel, NoActionsConcurrentModel
+from __future__ import absolute_import, unicode_literals
 from django.contrib.admin.models import LogEntry
 from django.contrib.contenttypes.models import ContentType
+from django.utils.encoding import force_unicode
+
+from concurrency.tests.base import AdminTestCase, SENTINEL
+from concurrency.tests.models import ListEditableConcurrentModel, NoActionsConcurrentModel
 
 
 class TestListEditable(AdminTestCase):
@@ -56,7 +59,7 @@ def test_message_user(self):
 
         self.assertIn('Record with pk `1` has been modified and was not updated',
                       messages)
-        self.assertIn('1 ListEditable-ConcurrentModel was changed successfully.',
+        self.assertIn('1 %s was changed successfully.' % force_unicode(self.TARGET._meta.verbose_name),
                       messages)
 
     def test_message_user_no_changes(self):
@@ -71,7 +74,7 @@ def test_message_user_no_changes(self):
 
         messages = map(str, list(res.context['messages']))
 
-        self.assertIn('No ListEditable-ConcurrentModel were changed due conflict errors',
+        self.assertIn('No %s were changed due conflict errors' % force_unicode(self.TARGET._meta.verbose_name),
                       messages)
         self.assertEqual(len(messages), 1)