Changeset 10518 for trunk/test

Timestamp:

10/11/08 12:22:04 (6 weeks ago)

Author:

asterix

Message:

[thorstenp] rename some var to not hide builts-in functions (list -> list_, ...)

Location:

trunk/test

Files:

• lib/mocks.py (modified) (1 diff)
• test_misc_interface.py (modified) (1 diff)

trunk/test/lib/mocks.py

@@ -123 +123 @@
 
 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
 

trunk/test/test_misc_interface.py

@@ -16 +16 @@
 
         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)