Avoid overwriting built-in functions/attributes.

pywinauto/clipboard.py

@@ -46,33 +46,33 @@ def GetClipboardFormats():
     win32clipboard.OpenClipboard()
 
     available_formats = []
-    format = 0
+    current_format = 0
     while True:
         # retrieve the next format
-        format = win32clipboard.EnumClipboardFormats(format)
+        current_format = win32clipboard.EnumClipboardFormats(current_format)
 
         # stop enumerating because all formats have been
         # retrieved
-        if not format:
+        if not current_format:
             break
 
-        available_formats.append(format)
+        available_formats.append(current_format)
 
     win32clipboard.CloseClipboard()
 
     return available_formats
 
 
 #====================================================================
-def GetFormatName(format):
+def GetFormatName(format_id):
     "Get the string name for a format value"
 
     # standard formats should not be passed to GetClipboardFormatName
-    if format in _standard_formats:
-        return _standard_formats[format]
+    if format_id in _standard_formats:
+        return _standard_formats[format_id]
 
     win32clipboard.OpenClipboard()
-    format_name = win32clipboard.GetClipboardFormatName(format)
+    format_name = win32clipboard.GetClipboardFormatName(format_id)
     win32clipboard.CloseClipboard()
 
     return format_name

pywinauto/findbestmatch.py

@@ -35,14 +35,6 @@
 #levenshtein_distance = ctypes.cdll.levenshtein.levenshtein_distance
 #levenshtein_distance = ldistance.distance
 
-# need to use sets.Set for python 2.3 compatability
-# but 2.6 raises a deprecation warning about sets module
-try:
-    set
-except NameError:
-    import sets
-    set = sets.Set
-
 find_best_control_match_cutoff = .6
 
 #====================================================================

pywinauto/handleprops.py

@@ -166,8 +166,8 @@ def is64bitprocess(process_id):
 #=========================================================================
 def is64bitbinary(filename):
     import win32file
-    type = win32file.GetBinaryType(filename)
-    return type != win32file.SCS_32BIT_BINARY
+    binary_type = win32file.GetBinaryType(filename)
+    return binary_type != win32file.SCS_32BIT_BINARY
 
 #=========================================================================
 def clientrect(handle):

pywinauto/tests/repeatedhotkey.py

@@ -1,4 +1,5 @@
 # GUI Application automation and testing library
+# Copyright (C) 2015 Intel Corporation
 # Copyright (C) 2010 Mark Mc Mahon
 #
 # This library is free software; you can redistribute it and/or
@@ -68,15 +69,6 @@
 """
 
 testname = "RepeatedHotkey"
-__revision__ = "$Revision$"
-
-# need to use sets.Set for python 2.3 compatability
-# but 2.6 raises a deprecation warning about sets module
-try:
-    set
-except NameError:
-    import sets
-    set = sets.Set
 
 from pywinauto.win32defines import SS_NOPREFIX
 
@@ -245,4 +237,3 @@ def ImplementsHotkey(win):
 
 
 RepeatedHotkeyTest.TestsMenus = True
-

pywinauto/unittests/test_SendKeys.py

@@ -53,7 +53,9 @@
 
 # Fix Python 2.x.
 if six.PY2:
-    input = raw_input
+    input_func = raw_input
+else:
+    input_func = input
 
 
 class SendKeysTests(unittest.TestCase):
@@ -79,7 +81,7 @@ def __run_NormalCharacters_with_options(self, **args):
                 continue
 
             SendKeys(chr(i) + "{ENTER}", pause = .001, **args)
-            received = input()
+            received = input_func()
 
             self.assertEquals(i, ord(received))
 
@@ -95,13 +97,13 @@ def testNormalWithoutSpaces(self):
     def testSpaceWithSpaces(self):
         "Make sure that with spaces option works"
         SendKeys(" \t \t {ENTER}", pause = .001, with_spaces = True)
-        received = input()
+        received = input_func()
         self.assertEquals("   ", received)
 
     def testSpaceWithoutSpaces(self):
         "Make sure that with spaces option works"
         SendKeys(" \t \t {ENTER}", pause = .001, with_spaces = False)
-        received = input()
+        received = input_func()
         self.assertEquals("", received)
 
 
@@ -117,20 +119,20 @@ def testNormalWithoutTabs(self):
     def testTabWithTabs(self):
         "Make sure that with spaces option works"
         SendKeys("\t \t \t{ENTER}", pause = .1, with_tabs = True)
-        received = input()
+        received = input_func()
         self.assertEquals("\t\t\t", received)
 
     def testTabWithoutTabs(self):
         "Make sure that with spaces option works"
         SendKeys("\t a\t b\t{ENTER}", pause = .1, with_tabs = False)
-        received = input()
+        received = input_func()
         self.assertEquals("ab", received)
 
 
     def testTab(self):
         "Make sure that with spaces option works"
         SendKeys("{TAB}  {TAB} {ENTER}", pause = .3)
-        received = input()
+        received = input_func()
         self.assertEquals("\t\t", received)
 
 
@@ -147,19 +149,19 @@ def testNormalWithoutNewlines(self):
     def testNewlinesWithNewlines(self):
         "Make sure that with spaces option works"
         SendKeys("\t \t \t a~\tb\nc{ENTER}", pause = .1, with_newlines = True)
-        received = input()
+        received = input_func()
         self.assertEquals("a", received)
 
-        received = input()
+        received = input_func()
         self.assertEquals("b", received)
 
-        received = input()
+        received = input_func()
         self.assertEquals("c", received)
 
     def testNewlinesWithoutNewlines(self):
         "Make sure that with spaces option works"
         SendKeys("\t \t \t\na{ENTER}", pause = .01, with_newlines = False)
-        received = input()
+        received = input_func()
         self.assertEquals("a", received)
 
 
@@ -175,7 +177,7 @@ def testANSIExtendedCharacters(self):
             else:
                 c = char.decode('cp850')
             SendKeys(c + "{ENTER}", pause = .01)
-            received = input()
+            received = input_func()
 
             if str(char) == received:
                 matched += 1
@@ -188,7 +190,7 @@ def testANSIExtendedCharacters(self):
     def testCharsThatMustBeEscaped(self):
         "Make sure that escaping characters works"
         SendKeys("{%}{^}{+}{(}{)}{{}{}}{~}{ENTER}")
-        received = input()
+        received = input_func()
         self.assertEquals("%^+(){}~", received)