100 lines
3.6 KiB
Diff
100 lines
3.6 KiB
Diff
Index: smartypants.py-2.0.1/tests/test_cli.py
|
|
===================================================================
|
|
--- smartypants.py-2.0.1.orig/tests/test_cli.py
|
|
+++ smartypants.py-2.0.1/tests/test_cli.py
|
|
@@ -35,7 +35,7 @@ class TestCLI(unittest.TestCase):
|
|
E = '“foobar”'
|
|
|
|
output = self._p([sys.executable, CLI_SCRIPT], T)
|
|
- self.assertEquals(output, E)
|
|
+ self.assertEqual(output, E)
|
|
|
|
def test_pipe_attr(self):
|
|
|
|
@@ -43,11 +43,11 @@ class TestCLI(unittest.TestCase):
|
|
|
|
E = T
|
|
output = self._p([sys.executable, CLI_SCRIPT, '--attr', '0'], T)
|
|
- self.assertEquals(output, E)
|
|
+ self.assertEqual(output, E)
|
|
|
|
E = """"foo" “bar”"""
|
|
output = self._p([sys.executable, CLI_SCRIPT, '--attr', 'b'], T)
|
|
- self.assertEquals(output, E)
|
|
+ self.assertEqual(output, E)
|
|
|
|
def test_skipped_elements(self):
|
|
|
|
@@ -55,19 +55,19 @@ class TestCLI(unittest.TestCase):
|
|
|
|
E = '<a>“foo”</a> <b>“bar”</b>'
|
|
output = self._p([sys.executable, CLI_SCRIPT], T)
|
|
- self.assertEquals(output, E)
|
|
+ self.assertEqual(output, E)
|
|
|
|
E = '<a>"foo"</a> <b>“bar”</b>'
|
|
output = self._p([sys.executable, CLI_SCRIPT, '--skip', 'a'], T)
|
|
- self.assertEquals(output, E)
|
|
+ self.assertEqual(output, E)
|
|
|
|
E = '<a>“foo”</a> <b>"bar"</b>'
|
|
output = self._p([sys.executable, CLI_SCRIPT, '--skip', 'b'], T)
|
|
- self.assertEquals(output, E)
|
|
+ self.assertEqual(output, E)
|
|
|
|
E = T
|
|
output = self._p([sys.executable, CLI_SCRIPT, '--skip', 'a,b'], T)
|
|
- self.assertEquals(output, E)
|
|
+ self.assertEqual(output, E)
|
|
|
|
def test_file(self):
|
|
|
|
@@ -82,4 +82,4 @@ class TestCLI(unittest.TestCase):
|
|
output = self._p([sys.executable, CLI_SCRIPT, F])
|
|
finally:
|
|
os.remove(F)
|
|
- self.assertEquals(output, E)
|
|
+ self.assertEqual(output, E)
|
|
Index: smartypants.py-2.0.1/smartypants.py
|
|
===================================================================
|
|
--- smartypants.py-2.0.1.orig/smartypants.py
|
|
+++ smartypants.py-2.0.1/smartypants.py
|
|
@@ -268,13 +268,13 @@ def smartypants(text, attr=None):
|
|
if do_quotes:
|
|
if t == "'":
|
|
# Special case: single-character ' token
|
|
- if re.match("\S", prev_token_last_char):
|
|
+ if re.match(r"\S", prev_token_last_char):
|
|
t = "’"
|
|
else:
|
|
t = "‘"
|
|
elif t == '"':
|
|
# Special case: single-character " token
|
|
- if re.match("\S", prev_token_last_char):
|
|
+ if re.match(r"\S", prev_token_last_char):
|
|
t = "”"
|
|
else:
|
|
t = "“"
|
|
Index: smartypants.py-2.0.1/tests/test.py
|
|
===================================================================
|
|
--- smartypants.py-2.0.1.orig/tests/test.py
|
|
+++ smartypants.py-2.0.1/tests/test.py
|
|
@@ -24,7 +24,7 @@ class SmartyPantsTestCase(unittest.TestC
|
|
|
|
T = sp(TEXT)
|
|
E = '“foo” -- bar'
|
|
- self.assertEquals(T, E)
|
|
+ self.assertEqual(T, E)
|
|
|
|
attr = Attr.q | Attr.d
|
|
Attr.default = attr
|
|
@@ -32,7 +32,7 @@ class SmartyPantsTestCase(unittest.TestC
|
|
|
|
T = sp(TEXT)
|
|
E = '“foo” — bar'
|
|
- self.assertEquals(T, E)
|
|
+ self.assertEqual(T, E)
|
|
|
|
def test_dates(self):
|
|
|