Merge pull request django#101 from jphalip/tickets/18409-regexfield-u…

…nicode Fixed #18409 -- Made RegexField work with unicode characters.
audreyfeldroy · May 31, 2012 · 314d82a · 314d82a
2 parents ba10be7 + f6fc83c
commit 314d82a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/django/forms/fields.py b/django/forms/fields.py
@@ -446,7 +446,7 @@ def _get_regex(self):
 
     def _set_regex(self, regex):
         if isinstance(regex, basestring):
-            regex = re.compile(regex)
+            regex = re.compile(regex, re.UNICODE)
         self._regex = regex
         if hasattr(self, '_regex_validator') and self._regex_validator in self.validators:
             self.validators.remove(self._regex_validator)

diff --git a/tests/regressiontests/forms/tests/fields.py b/tests/regressiontests/forms/tests/fields.py
@@ -478,6 +478,14 @@ def test_regexfield_5(self):
         self.assertRaisesMessage(ValidationError, "[u'Ensure this value has at most 10 characters (it has 11).']", f.clean, '12345678901')
         self.assertRaisesMessage(ValidationError, "[u'Enter a valid value.']", f.clean, '12345a')
 
+    def test_regexfield_6(self):
+        """
+        Ensure that it works with unicode characters.
+        Refs #.
+        """
+        f = RegexField('^\w+$')
+        self.assertEqual(u'éèøçÎÎ你好', f.clean(u'éèøçÎÎ你好'))
+
     def test_change_regex_after_init(self):
         f = RegexField('^[a-z]+$')
         f.regex = '^\d+$'