diff options
| author | Yann Leboulanger <asterix@lagaule.org> | 2008-10-11 14:22:04 +0400 |
|---|---|---|
| committer | Yann Leboulanger <asterix@lagaule.org> | 2008-10-11 14:22:04 +0400 |
| commit | 158538b81cea0f9b8348fc7e25fc3458b9894b50 (patch) | |
| tree | 36bb2724304181e6229194c313f52c8e3418d2e7 /test | |
| parent | 7ca3dabbb9cca5021a356572925bd8c0c5c49cc2 (diff) | |
[thorstenp] rename some var to not hide builts-in functions (list -> list_, ...)
Diffstat (limited to 'test')
| -rw-r--r-- | test/lib/mocks.py | 4 | ||||
| -rw-r--r-- | test/test_misc_interface.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/lib/mocks.py b/test/lib/mocks.py index 8d0e80f96..a58d24de8 100644 --- a/test/lib/mocks.py +++ b/test/lib/mocks.py @@ -122,12 +122,12 @@ class MockContact(Mock): import random class MockSession(Mock): - def __init__(self, conn, jid, thread_id, type): + def __init__(self, conn, jid, thread_id, type_): Mock.__init__(self) self.conn = conn self.jid = jid - self.type = type + self.type = type_ self.thread_id = thread_id if not self.thread_id: diff --git a/test/test_misc_interface.py b/test/test_misc_interface.py index ce837edd5..7398fb619 100644 --- a/test/test_misc_interface.py +++ b/test/test_misc_interface.py @@ -15,11 +15,11 @@ Interface() class TestMiscInterface(unittest.TestCase): def test_links_regexp_entire(self): - def assert_matches_all(str): - m = gajim.interface.basic_pattern_re.match(str) + def assert_matches_all(str_): + m = gajim.interface.basic_pattern_re.match(str_) # the match should equal the string - str_span = (0, len(str)) + str_span = (0, len(str_)) self.assertEqual(m.span(), str_span) # these entire strings should be parsed as links |