Changeset 6effd50 for server/lib/gutenbach/server/printer.py

Timestamp:

Dec 20, 2011, 1:47:35 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

cad7502

Parents:

f6c6897

git-author:

Jessica B. Hamrick <jhamrick@…> (12/20/11 13:47:35)

git-committer:

Jessica B. Hamrick <jhamrick@…> (12/20/11 13:47:35)

Message:

Fix some errors in server/, handle fatal errors better

File:

• server/lib/gutenbach/server/printer.py (modified) (2 diffs)

server/lib/gutenbach/server/printer.py

@@ -61 +61 @@
     def __getattr__(self, attr):
         try:
-            return super(Printer, self).__getattr__(attr)
+            return self.__getattribute__(attr)
         except AttributeError:
             pass
-
-        return super(Printer, self).__getattr__(
-            attr.replace("-", "_"))
+        return self.__getattribute__(attr.replace("-", "_"))
 
     def __hasattr__(self, attr):
-        has = super(Printer, self).__hasattr__(attr)
-        if not has:
-            has = super(Printer, self).__hasattr__(
-                attr.replace("-", "_"))
-        return has
+        try:
+            getattr(self, attr)
+            return True
+        except AttributeError:
+            return False
 
     ## Printer attributes
@@ -156 +154 @@
     def get_printer_attributes(self, request):
         attributes = [(attr, getattr(self, attr)) for attr in self.attributes]
-        attributes = map(lambda x: x if isinstance(x, (tuple, list)) else [x], attributes)
+        attributes = map(lambda x: x if isinstance(x[1], (tuple, list)) else (x[0], [x[1]]),
+                         attributes)
         return attributes