Permalink
Browse files

Python 2.6 test fixes

  • Loading branch information...
1 parent 38747ef commit fef98decddd9b60159608584b2b5f5c812a81a1e @pekkaklarck pekkaklarck committed Dec 31, 2016
@@ -8,5 +8,5 @@ def get_keyword_names(self):
'Conflict']
def run_keyword(self, name, args):
- print("Running keyword '{}'.".format(name))
+ print("Running keyword '%s'." % name)
return '-'.join(args)
@@ -84,7 +84,10 @@ def cannot_differ(self, value1, value2):
if type(value1) is not type(value2):
return False
# None, Booleans, small numbers, etc. are singletons.
- return id(value1) == id(copy.deepcopy(value1))
+ try:
+ return id(value1) == id(copy.deepcopy(value1))
+ except TypeError: # Got in some cases at least with Python 2.6
+ return True
if __name__ == '__main__':

0 comments on commit fef98de

Please sign in to comment.