Commit 81b9ebb3 authored by Michal Čihař's avatar Michal Čihař

Do not use deprecated methods

parent 20d91f4c
...@@ -543,7 +543,7 @@ class CaptchaTest(UnitTestCase): ...@@ -543,7 +543,7 @@ class CaptchaTest(UnitTestCase):
question = '1 + 1' question = '1 + 1'
timestamp = 1000 timestamp = 1000
hashed = hash_question(question, timestamp) hashed = hash_question(question, timestamp)
self.assertEquals( self.assertEqual(
(question, timestamp), (question, timestamp),
unhash_question(hashed) unhash_question(hashed)
) )
...@@ -572,7 +572,7 @@ class CaptchaTest(UnitTestCase): ...@@ -572,7 +572,7 @@ class CaptchaTest(UnitTestCase):
captcha.validate(2) captcha.validate(2)
) )
restored = MathCaptcha.from_hash(captcha.hashed) restored = MathCaptcha.from_hash(captcha.hashed)
self.assertEquals( self.assertEqual(
captcha.question, captcha.question,
restored.question restored.question
) )
......
...@@ -27,7 +27,7 @@ class ReportFilterTest(TestCase): ...@@ -27,7 +27,7 @@ class ReportFilterTest(TestCase):
def test_report_none(self): def test_report_none(self):
reporter = WeblateExceptionReporterFilter() reporter = WeblateExceptionReporterFilter()
result = reporter.get_request_repr(None) result = reporter.get_request_repr(None)
self.assertEquals( self.assertEqual(
'None', 'None',
result result
) )
......
...@@ -43,9 +43,9 @@ class AutoFormatTest(TestCase): ...@@ -43,9 +43,9 @@ class AutoFormatTest(TestCase):
def test_parse(self): def test_parse(self):
storage = self.FORMAT(self.FILE) storage = self.FORMAT(self.FILE)
self.assertEquals(storage.count_units(), self.COUNT) self.assertEqual(storage.count_units(), self.COUNT)
self.assertEquals(storage.mimetype, self.MIME) self.assertEqual(storage.mimetype, self.MIME)
self.assertEquals(storage.extension, self.EXT) self.assertEqual(storage.extension, self.EXT)
def test_find(self): def test_find(self):
storage = self.FORMAT(self.FILE) storage = self.FORMAT(self.FILE)
...@@ -54,7 +54,7 @@ class AutoFormatTest(TestCase): ...@@ -54,7 +54,7 @@ class AutoFormatTest(TestCase):
if self.COUNT == 0: if self.COUNT == 0:
self.assertTrue(unit is None) self.assertTrue(unit is None)
else: else:
self.assertEquals(unit.get_target(), u'Ahoj světe!\n') self.assertEqual(unit.get_target(), u'Ahoj světe!\n')
def test_add(self): def test_add(self):
if self.FORMAT.supports_new_language(): if self.FORMAT.supports_new_language():
......
...@@ -238,24 +238,24 @@ class HooksViewTest(ViewTestCase): ...@@ -238,24 +238,24 @@ class HooksViewTest(ViewTestCase):
'project': self.subproject.project.slug 'project': self.subproject.project.slug
}) })
) )
self.assertEquals(response.status_code, 405) self.assertEqual(response.status_code, 405)
response = self.client.get( response = self.client.get(
reverse('hook-subproject', kwargs={ reverse('hook-subproject', kwargs={
'project': self.subproject.project.slug, 'project': self.subproject.project.slug,
'subproject': self.subproject.slug, 'subproject': self.subproject.slug,
}) })
) )
self.assertEquals(response.status_code, 405) self.assertEqual(response.status_code, 405)
response = self.client.post( response = self.client.post(
reverse('hook-github'), reverse('hook-github'),
{'payload': GITHUB_PAYLOAD} {'payload': GITHUB_PAYLOAD}
) )
self.assertEquals(response.status_code, 405) self.assertEqual(response.status_code, 405)
response = self.client.post( response = self.client.post(
reverse('hook-bitbucket'), reverse('hook-bitbucket'),
{'payload': BITBUCKET_PAYLOAD_GIT} {'payload': BITBUCKET_PAYLOAD_GIT}
) )
self.assertEquals(response.status_code, 405) self.assertEqual(response.status_code, 405)
def test_wrong_payload(self): def test_wrong_payload(self):
''' '''
......
...@@ -64,7 +64,7 @@ class NaturalTimeTest(TestCase): ...@@ -64,7 +64,7 @@ class NaturalTimeTest(TestCase):
for diff, expected in TEST_DATA: for diff, expected in TEST_DATA:
testdate = now + datetime.timedelta(seconds=diff) testdate = now + datetime.timedelta(seconds=diff)
result = naturaltime(testdate, now) result = naturaltime(testdate, now)
self.assertEquals( self.assertEqual(
expected, result, expected, result,
'naturaltime(%s) [%s] != "%s"' % ( 'naturaltime(%s) [%s] != "%s"' % (
testdate, result, expected, testdate, result, expected,
......
...@@ -142,7 +142,7 @@ class ViewTestCase(RepoTestCase): ...@@ -142,7 +142,7 @@ class ViewTestCase(RepoTestCase):
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
# Try to load PNG with PIL # Try to load PNG with PIL
image = Image.open(StringIO(response.content)) image = Image.open(StringIO(response.content))
self.assertEquals(image.format, 'PNG') self.assertEqual(image.format, 'PNG')
def assertBackend(self, expected_translated): def assertBackend(self, expected_translated):
''' '''
...@@ -470,7 +470,7 @@ class EditTest(ViewTestCase): ...@@ -470,7 +470,7 @@ class EditTest(ViewTestCase):
# Did the commit message got stored? # Did the commit message got stored?
translation = self.get_translation() translation = self.get_translation()
self.assertEquals( self.assertEqual(
'Fixing issue #666', 'Fixing issue #666',
translation.commit_message translation.commit_message
) )
...@@ -691,7 +691,7 @@ class SuggestionsTest(ViewTestCase): ...@@ -691,7 +691,7 @@ class SuggestionsTest(ViewTestCase):
self.assertEqual(len(unit.checks()), 0) self.assertEqual(len(unit.checks()), 0)
self.assertFalse(unit.translated) self.assertFalse(unit.translated)
self.assertFalse(unit.fuzzy) self.assertFalse(unit.fuzzy)
self.assertEquals(len(self.get_unit().suggestions()), 2) self.assertEqual(len(self.get_unit().suggestions()), 2)
def test_delete(self): def test_delete(self):
translate_url = self.get_translation().get_translate_url() translate_url = self.get_translation().get_translate_url()
...@@ -701,7 +701,7 @@ class SuggestionsTest(ViewTestCase): ...@@ -701,7 +701,7 @@ class SuggestionsTest(ViewTestCase):
# Get ids of created suggestions # Get ids of created suggestions
suggestions = [sug.pk for sug in self.get_unit().suggestions()] suggestions = [sug.pk for sug in self.get_unit().suggestions()]
self.assertEquals(len(suggestions), 2) self.assertEqual(len(suggestions), 2)
# Delete one of suggestions # Delete one of suggestions
response = self.edit_unit( response = self.edit_unit(
...@@ -724,7 +724,7 @@ class SuggestionsTest(ViewTestCase): ...@@ -724,7 +724,7 @@ class SuggestionsTest(ViewTestCase):
self.assertEqual(len(unit.checks()), 0) self.assertEqual(len(unit.checks()), 0)
self.assertFalse(unit.translated) self.assertFalse(unit.translated)
self.assertFalse(unit.fuzzy) self.assertFalse(unit.fuzzy)
self.assertEquals(len(self.get_unit().suggestions()), 1) self.assertEqual(len(self.get_unit().suggestions()), 1)
def test_accept(self): def test_accept(self):
translate_url = self.get_translation().get_translate_url() translate_url = self.get_translation().get_translate_url()
...@@ -734,7 +734,7 @@ class SuggestionsTest(ViewTestCase): ...@@ -734,7 +734,7 @@ class SuggestionsTest(ViewTestCase):
# Get ids of created suggestions # Get ids of created suggestions
suggestions = [sug.pk for sug in self.get_unit().suggestions()] suggestions = [sug.pk for sug in self.get_unit().suggestions()]
self.assertEquals(len(suggestions), 2) self.assertEqual(len(suggestions), 2)
# Accept one of suggestions # Accept one of suggestions
response = self.edit_unit( response = self.edit_unit(
...@@ -758,7 +758,7 @@ class SuggestionsTest(ViewTestCase): ...@@ -758,7 +758,7 @@ class SuggestionsTest(ViewTestCase):
self.assertFalse(unit.fuzzy) self.assertFalse(unit.fuzzy)
self.assertEqual(unit.target, 'Ahoj svete!\n') self.assertEqual(unit.target, 'Ahoj svete!\n')
self.assertBackend(1) self.assertBackend(1)
self.assertEquals(len(self.get_unit().suggestions()), 1) self.assertEqual(len(self.get_unit().suggestions()), 1)
def test_accept_anonymous(self): def test_accept_anonymous(self):
translate_url = self.get_translation().get_translate_url() translate_url = self.get_translation().get_translate_url()
...@@ -770,7 +770,7 @@ class SuggestionsTest(ViewTestCase): ...@@ -770,7 +770,7 @@ class SuggestionsTest(ViewTestCase):
# Get ids of created suggestion # Get ids of created suggestion
suggestions = list(self.get_unit().suggestions()) suggestions = list(self.get_unit().suggestions())
self.assertEquals(len(suggestions), 1) self.assertEqual(len(suggestions), 1)
self.assertIsNone(suggestions[0].user) self.assertIsNone(suggestions[0].user)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment