Changeset 7851

Timestamp:

07/06/08 09:20:30 (6 months ago)

Author:

mtredinnick

Message:

Revert [7849] and [7850]. Brain failure on my part.

Files:

• django/trunk/django/utils/regex_helper.py (deleted)
• django/trunk/tests/regressiontests/urlpatterns_reverse/tests.py (modified) (5 diffs)

django/trunk/tests/regressiontests/urlpatterns_reverse/tests.py

@@ -1 @@
-
-
-
-
-
-
+
-
-from django.core.urlresolvers import reverse_helper, NoReverseMatch
+import re, unittest
-
-test_data = (
@@ -13 +9 @@
-    ('^places/(\d+)/$', NoReverseMatch, ['a'], {}),
-    ('^places/(\d+)/$', NoReverseMatch, [], {}),
-    ('^places?/$', '/', [], {}),
-    ('^places+/$', 'places/', [], {}),
-    ('^places*/$', '/', [], {}),
-    (r'^places/(\d+|[a-z_]+)/', 'places/4/', [4], {}),
-    (r'^places/(\d+|[a-z_]+)/', 'places/harlem/', ['harlem'], {}),
-    (r'^places/(\d+|[a-z_]+)/', NoReverseMatch, ['harlem64'], {}),
-    ('^places/(?P<id>\d+)/$', 'places/3/', [], {'id': 3}),
-    ('^people/(?P<name>\w+)/$', NoReverseMatch, [], {}),
-    ('^people/(?P<name>\w+)/$', 'people/adrian/', ['adrian'], {}),
-    ('^people/(?P<name>\w+)/$', 'people/adrian/', [], {'name': 'adrian'}),
-    ('^people/(?P<name>\w+)/$', NoReverseMatch, ['name with spaces'], {}),
-    ('^people/(?P<name>\w+)/$', NoReverseMatch, [], {'name': 'name with spaces'}),
-
-
-
+
-    ('^hardcoded/$', 'hardcoded/', [], {}),
-    ('^hardcoded/$', 'hardcoded/', ['any arg'], {}),
@@ -38 +25 @@
-    ('^people/(?P<state>\w\w)/(\w+)/$', NoReverseMatch, ['il'], {'name': 'adrian'}),
-    ('^people/(?P<state>\w\w)/(\w+)/$', 'people/il/adrian/', ['adrian'], {'state': 'il'}),
-    (r'^people/((?P<state>\w\w)/test)?/(\w+)/$', 'people/il/test/adrian/', ['adrian'], {'state': 'il'}),
-    (r'^people/((?P<state>\w\w)/test)?/(\w+)/$', NoReverseMatch, ['adrian'], {}),
-    ('^character_set/[abcdef0-9]/$', 'character_set/a/', [], {}),
-    ('^character_set/[\w]/$', 'character_set/a/', [], {}),
-    (r'^price/\$(\d+)/$', 'price/$10/', ['10'], {}),
-    (r'^price/[$](\d+)/$', 'price/$10/', ['10'], {}),
-    (r'^price/[\$](\d+)/$', 'price/$10/', ['10'], {}),
-    (r'^product/(?P<product>\w+)\+\(\$(?P<price>\d+(\.\d+)?)\)/$', 'product/chocolate+($2.00)/', ['2.00'], {'product': 'chocolate'}),
-    (r'^headlines/(?P<year>\d+)\.(?P<month>\d+)\.(?P<day>\d+)/$', 'headlines/2007.5.21/', [], dict(year=2007, month=5, day=21)),
-    (r'^windows_path/(?P<drive_name>[A-Z]):\\(?P<path>.+)/$', r'windows_path/C:\Documents and Settings\spam/', [], dict(drive_name='C', path=r'Documents and Settings\spam')),
-    (r'^special_chars/(.+)/$', r'special_chars/+\$*/', [r'+\$*'], {}),
-    (r'^special_chars/(.+)/$', NoReverseMatch, [''], {}),
-    (r'^(?P<name>.+)/\d+/$', NoReverseMatch, [], {'name': 'john'}),
-    (r'^repeats/a{1,2}/$', 'repeats/a/', [], {}),
-    (r'^repeats/a{2,4}/$', 'repeats/aa/', [], {}),
-    (r'^people/(?:(?:wilma|fred)/)$', '/people/wilma', [], {}),
-)
-
@@ -60 +31 @@
-        for regex, expected, args, kwargs in test_data:
-            try:
-gex
+.compile(regex)
-            except NoReverseMatch, e:
-                self.assertEqual(expected, NoReverseMatch)
@@ -66 +37 @@
-                self.assertEquals(got, expected)
-
+if __name__ == "__main__":
+    run_tests(1)