Few cleanups.

kolik1983 · Oct 20, 2016 · 19db60c · 19db60c
1 parent f04a181
commit 19db60c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/ci/runTestsuite.ps1 b/ci/runTestsuite.ps1
@@ -33,8 +33,7 @@ function run {
     $output = "transformed.xml"
 
     #nosetests  --all-modules --with-xunit pywinauto/unittests
-    nosetests --nologcapture --exclude=testall --with-xunit --with-coverage --cover-html --cover-html-dir=Coverage_report --cover-package=pywinauto --verbosity=3 pywinauto\fuzzydict.py
-    nosetests --nologcapture --exclude=testall --with-xunit --with-coverage --cover-html --cover-html-dir=Coverage_report --cover-package=pywinauto --verbosity=3 pywinauto\unittests
+    nosetests --nologcapture --exclude=testall --with-xunit --with-coverage --cover-html --cover-html-dir=Coverage_report --cover-package=pywinauto --verbosity=3 pywinauto\unittests pywinauto\fuzzydict.py
     $success = $?
     Write-Host "result code of nosetests:" $success
 

diff --git a/pywinauto/findbestmatch.py b/pywinauto/findbestmatch.py
@@ -329,7 +329,7 @@ def get_control_names(control, allcontrols, textcontrols):
 #====================================================================
 class UniqueDict(dict):
 
-    """A dictionary subclass that handles making it's keys unique"""
+    """A dictionary subclass that handles making its keys unique"""
 
     def __setitem__(self, text, item):
         """Set an item of the dictionary"""

diff --git a/pywinauto/uia_element_info.py b/pywinauto/uia_element_info.py
@@ -241,7 +241,7 @@ def children(self, **kwargs):
         """Return a list of only immediate children of the element
 
         * **kwargs** is a criteria to reduce a list by process,
-        class_name and/or title.
+        class_name, control_type, is_content_element and/or title.
         """
         cache_enable = kwargs.pop('cache_enable', False)
         cond = IUIA().build_condition(**kwargs)
@@ -251,7 +251,7 @@ def descendants(self, **kwargs):
         """Return a list of all descendant children of the element
 
         * **kwargs** is a criteria to reduce a list by process,
-        class_name and/or title.
+        class_name, control_type, is_content_element and/or title.
         """
         cache_enable = kwargs.pop('cache_enable', False)
         cond = IUIA().build_condition(**kwargs)

diff --git a/pywinauto/unittests/test_findwindows.py b/pywinauto/unittests/test_findwindows.py
@@ -38,11 +38,8 @@
 sys.path.append(".")
 from pywinauto.application import Application
 from pywinauto.sysinfo import is_x64_Python
-#from pywinauto.findwindows import find_elements, find_element
 from pywinauto.findwindows import find_window, find_windows
-#from pywinauto.findwindows import ElementNotFoundError
 from pywinauto.findwindows import WindowNotFoundError
-#from pywinauto.findwindows import ElementAmbiguousError
 from pywinauto.findwindows import WindowAmbiguousError
 from pywinauto.timings import Timings