From 3fb8f3214c91bcd63b5fe4e3a0206a05f8038c39 Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Wed, 19 Jun 2013 00:39:46 -0400 Subject: [PATCH] Fix StringMixIn.maketrans() on Py3k. - Make a test in Py3k actually use StringMixIn instead of str. - Minor cosmetic fix. --- mwparserfromhell/nodes/template.py | 2 +- mwparserfromhell/string_mixin.py | 8 ++++---- tests/test_string_mixin.py | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mwparserfromhell/nodes/template.py b/mwparserfromhell/nodes/template.py index 3834d41..6dfc4f0 100644 --- a/mwparserfromhell/nodes/template.py +++ b/mwparserfromhell/nodes/template.py @@ -293,7 +293,7 @@ class Template(Node): """ name = name.strip() if isinstance(name, basestring) else str(name) removed = False - to_remove =[] + to_remove = [] for i, param in enumerate(self.params): if param.name.strip() == name: if keep_field: diff --git a/mwparserfromhell/string_mixin.py b/mwparserfromhell/string_mixin.py index 89c1bc0..a406401 100644 --- a/mwparserfromhell/string_mixin.py +++ b/mwparserfromhell/string_mixin.py @@ -253,12 +253,12 @@ class StringMixIn(object): if py3k: @staticmethod @inheritdoc - def maketrans(self, x, y=None, z=None): + def maketrans(x, y=None, z=None): if z is None: if y is None: - return self.__unicode__.maketrans(x) - return self.__unicode__.maketrans(x, y) - return self.__unicode__.maketrans(x, y, z) + return str.maketrans(x) + return str.maketrans(x, y) + return str.maketrans(x, y, z) @inheritdoc def partition(self, sep): diff --git a/tests/test_string_mixin.py b/tests/test_string_mixin.py index 306f2fd..b829bb2 100644 --- a/tests/test_string_mixin.py +++ b/tests/test_string_mixin.py @@ -414,10 +414,10 @@ class TestStringMixIn(unittest.TestCase): self.assertEqual("Fake String", str1.title()) if py3k: - table1 = str.maketrans({97: "1", 101: "2", 105: "3", 111: "4", - 117: "5"}) - table2 = str.maketrans("aeiou", "12345") - table3 = str.maketrans("aeiou", "12345", "rts") + table1 = StringMixIn.maketrans({97: "1", 101: "2", 105: "3", + 111: "4", 117: "5"}) + table2 = StringMixIn.maketrans("aeiou", "12345") + table3 = StringMixIn.maketrans("aeiou", "12345", "rts") self.assertEqual("f1k2 str3ng", str1.translate(table1)) self.assertEqual("f1k2 str3ng", str1.translate(table2)) self.assertEqual("f1k2 3ng", str1.translate(table3))