Various fixes

vrutkovs · Oct 24, 2013 · 8963416 · 8963416
1 parent e3dd950
commit 8963416
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/dogtail/logging.py b/dogtail/logging.py
@@ -193,9 +193,9 @@ def log(self, entry):
             value = value[0]
             entry = str(key) + ":      " + str(value)
         else:
+            print("Method argument requires a 1 {key: value} dict." +
+                  " Supplied argument not one {key: value}")
             raise ValueError(entry)
-            print(
-                "Method argument requires a 1 {key: value} dict. Supplied argument not one {key: value}")
 
         Logger.log(self, self.stamper.entryStamp() + "      " + entry,
                    force=True)

diff --git a/dogtail/predicate.py b/dogtail/predicate.py
@@ -179,7 +179,7 @@ def describeSearchResult(self):
 
     def makeScriptMethodCall(self, isRecursive):
         if self.label:
-            args = "label='%s'" % self.label
+            args = "label=%s" % self.label
         else:
             args = ""
             if self.name:

diff --git a/dogtail/procedural.py b/dogtail/procedural.py
@@ -54,7 +54,7 @@ def __getattr__(self, name):
     def __setattr__(self, name, value):
         # Fold all the Node's AT-SPI properties into the Focus object.
         if name == 'node':
-            self.__class__.__dict__[name] = value
+            setattr(self.__class__, name, value)
         else:
             try:
                 setattr(self.node, name, value)

diff --git a/sniff/sniff.desktop b/sniff/sniff.desktop
@@ -1,15 +1,15 @@
 [Desktop Entry]
-Encoding = UTF - 8
-Name = AT - SPI Browser
-Name[en_CA] = AT - SPI Browser
-Name[en_GB] = AT - SPI Browser
-Comment = Browse your Assistive Technology - enabled desktop
-Comment[en_CA] = Browse your Assistive Technology - enabled desktop
-Comment[en_GB] = Browse your Assistive Technology - enabled desktop
-Exec = sniff
-Terminal = false
-Type = Application
-Icon = dogtail - head
-StartupNotify = true
-Categories = Application
-Development
+Encoding=UTF-8
+Name=AT-SPI Browser
+Name[en_CA]=AT-SPI Browser
+Name[en_GB]=AT-SPI Browser
+Comment=Browse your Assistive Technology-enabled desktop
+Comment[en_CA]=Browse your Assistive Technology-enabled desktop
+Comment[en_GB]=Browse your Assistive Technology-enabled desktop
+Exec=sniff
+Terminal=false
+Type=Application
+Icon=dogtail-head
+StartupNotify=true
+Categories=Application;Development;
+