aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/tests/urlpatterns.py
diff options
context:
space:
mode:
authorTom Christie2013-02-27 13:15:47 -0800
committerTom Christie2013-02-27 13:15:47 -0800
commita2dafd96439afc958b0e3dafdf543ca9843fd0d2 (patch)
tree68ea6caa6c0a84bd93fe70a10b003fd7109bf1c0 /rest_framework/tests/urlpatterns.py
parent35331f5820cff9a5cd97ccff2c1cbbb8a5a62790 (diff)
parenta1dbd93f5467a8a25e18516f57f34c15b3b31b36 (diff)
downloaddjango-rest-framework-a2dafd96439afc958b0e3dafdf543ca9843fd0d2.tar.bz2
Merge pull request #692 from tomchristie/django1.5
Django 1.5
Diffstat (limited to 'rest_framework/tests/urlpatterns.py')
-rw-r--r--rest_framework/tests/urlpatterns.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/tests/urlpatterns.py b/rest_framework/tests/urlpatterns.py
index 82cd6cdb..29ed4a96 100644
--- a/rest_framework/tests/urlpatterns.py
+++ b/rest_framework/tests/urlpatterns.py
@@ -32,8 +32,8 @@ class FormatSuffixTests(TestCase):
callback, callback_args, callback_kwargs = resolver.resolve(request.path_info)
except Exception:
self.fail("Failed to resolve URL: %s" % request.path_info)
- self.assertEquals(callback_args, test_path.args)
- self.assertEquals(callback_kwargs, test_path.kwargs)
+ self.assertEqual(callback_args, test_path.args)
+ self.assertEqual(callback_kwargs, test_path.kwargs)
def test_format_suffix(self):
urlpatterns = patterns(