Changeset 44 for pkipplib/trunk/pkipplib/pkipplib.py

Timestamp:

12/11/07 18:16:27 (16 years ago)

Author:

jerome

Message:

Adds the requesting-user-name operation attribute if authentication
is needed.

Files:

• pkipplib/trunk/pkipplib/pkipplib.py (modified) (3 diffs)

pkipplib/trunk/pkipplib/pkipplib.py

@@ -583 +583 @@
 class CUPS :
     """A class for a CUPS instance."""
-    def __init__(self, url=None, username=None, password=None, charset="utf-8", language="en-us", debug=False) :
+    def __init__(self, url=None, username=None, password=None, charset="utf-8", language="en-US", debug=False) :
         """Initializes the CUPS instance."""
         if url is not None :
@@ -638 +638 @@
             req.operation["attributes-charset"] = ("charset", self.charset)
             req.operation["attributes-natural-language"] = ("naturalLanguage", self.language)
+            if self.username :
+                req.operation["requesting-user-name"] = ("nameWithoutLanguage", self.username)
             return req
     
@@ -790 +792 @@
             req.subscription["notify-pull-method"] = ("keyword", pullmethod)
         if charset is not None :
-            req.subscription["notify-charset"] = ("charset", charset)
+            req.subscription["notify-charset"] = ("charset", charset or self.charset)
         if naturallanguage is not None :
-            req.subscription["notify-natural-language"] = ("naturalLanguage", naturallanguage)
+            req.subscription["notify-natural-language"] = ("naturalLanguage", naturallanguage or self.language)
         if leaseduration is not None :
             req.subscription["notify-lease-duration"] = ("integer", leaseduration)