Fix potential bugs detected by QuantifiedCode.com.

onlyone0001 · Aug 3, 2015 · f8f3f3e · f8f3f3e
1 parent 6df1407
commit f8f3f3e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/pywinauto/controlproperties.py b/pywinauto/controlproperties.py
@@ -89,8 +89,10 @@ def GetMenuBlocks(ctrls):
 
 
 #====================================================================
-def MenuBlockAsControls(menuItems, parentage = []):
+def MenuBlockAsControls(menuItems, parentage = None):
 
+    if parentage is None:
+        parentage = []
     blocks = []
 
     curBlock = []

diff --git a/pywinauto/tests/truncation.py b/pywinauto/tests/truncation.py
@@ -543,7 +543,6 @@ def _WindowTruncInfo(win):
     "CheckBox" : _CheckBoxTruncInfo,
     "GroupBox" : _GroupBoxTruncInfo,
     "RadioButton" : _RadioButtonTruncInfo,
-    "Button" : _ButtonTruncInfo,
     "Edit": _EditTruncInfo,
     "Static" : _StaticTruncInfo,
 

diff --git a/pywinauto/win32functions.py b/pywinauto/win32functions.py
@@ -18,13 +18,11 @@
 #    59 Temple Place,
 #    Suite 330,
 #    Boston, MA 02111-1307 USA
-"Defines Windows(tm) functions"
+"""Defines Windows(tm) functions"""
 from __future__ import absolute_import
 
-__revision__ = "$Revision$"
-
 import ctypes
-from ctypes import *
+from ctypes import c_uint, c_short
 
 import sys
 if sys.platform == "cygwin":

diff --git a/sandbox/controlactions.py b/sandbox/controlactions.py
@@ -877,7 +877,7 @@ def add_actions(to_obj):
             to_obj.__class__, action_name, _standard_action_funcs[action_name])
 
     # check if there are actions specific to this type of control
-    if _class_specific_actions.has_key(to_obj.FriendlyClassName):
+    if to_obj.FriendlyClassName in _class_specific_actions.keys():
 
         # apply these actions to the class
         actions = _class_specific_actions[to_obj.FriendlyClassName]