Syntax changes to work on py26

Author: nicoddemus

pytestqt/_tests/test_logging.py

@@ -102,7 +102,7 @@ def test_types():
         """
     )
     f = '{rec.type_name} {rec.log_type_name} {rec.when:%Y-%m-%d}: {rec.message}'
-    res = testdir.runpytest('--qt-log-format={}'.format(f))
+    res = testdir.runpytest('--qt-log-format={0}'.format(f))
     today = '{0:%Y-%m-%d}'.format(datetime.datetime.now())
     res.stdout.fnmatch_lines([
         '*-- Captured Qt messages --*',

pytestqt/_tests/test_wait_signal.py

@@ -210,7 +210,7 @@ def check(self, timeout, *delays):
             delays used to trigger a signal has passed.
             """
             if timeout is None:
-                timeout = max(delays) * 1.2  # 20% tolerance
+                timeout = max(delays) * 1.25  # 25% tolerance
             max_wait_ms = max(delays + (timeout,))
             assert time.time() - self._start_time < (max_wait_ms / 1000.0)
 

pytestqt/plugin.py

@@ -682,7 +682,7 @@ def _handle(self, msg_type, message):
         into the `messages` attribute.
         """
         if isinstance(message, bytes):
-            message = message.decode('utf-8', errors='replace')
+            message = message.decode('utf-8', 'replace')
         self._records.append(Record(msg_type, message))
 
     @property
@@ -751,11 +751,11 @@ def _get_log_type_name(cls, msg_type):
 
     def matches_level(self, level):
         if level == 'DEBUG':
-            return self.log_type_name in {'DEBUG', 'WARNING', 'CRITICAL'}
+            return self.log_type_name in set(['DEBUG', 'WARNING', 'CRITICAL'])
         elif level == 'WARNING':
-            return self.log_type_name in {'WARNING', 'CRITICAL'}
+            return self.log_type_name in set(['WARNING', 'CRITICAL'])
         elif level == 'CRITICAL':
-            return self.log_type_name in {'CRITICAL'}
+            return self.log_type_name in set(['CRITICAL'])
         else:
             raise ValueError('log_fail_level unknown: {0}'.format(level))