Changeset 789

Timestamp:

02/10/03 12:47:39 (21 years ago)

Author:

jalet

Message:

Moved some code down into the requesters

Location:

pykota/trunk/pykota

Files:

• config.py (modified) (2 diffs)
• requesters/external.py (modified) (2 diffs)
• requesters/snmp.py (modified) (2 diffs)

pykota/trunk/pykota/config.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.13  2003/02/10 11:47:39  jalet
+# Moved some code down into the requesters
+#
 # Revision 1.12  2003/02/10 10:36:33  jalet
 # Small problem wrt external requester
@@ -151 +154 @@
         if args.endswith(')') :
             args = args[:-1]
-        args = [x.strip() for x in args.split(',')]
         if not args :
             raise PyKotaConfigError, _("Invalid requester %s for printer %s") % (fullrequester, printer)

pykota/trunk/pykota/requesters/external.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.5  2003/02/10 11:47:39  jalet
+# Moved some code down into the requesters
+#
 # Revision 1.4  2003/02/10 10:36:33  jalet
 # Small problem wrt external requester
@@ -39 +42 @@
         """Sets instance vars depending on the current printer."""
         self.printername = printername
-        self.commandline = arguments[0]
+        self.commandline = arguments.strip()
         
     def getPrinterPageCounter(self, printer) :

pykota/trunk/pykota/requesters/snmp.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.6  2003/02/10 11:47:39  jalet
+# Moved some code down into the requesters
+#
 # Revision 1.5  2003/02/10 00:42:17  jalet
 # External requester should be ok (untested)
@@ -43 +46 @@
         """Sets instance vars depending on the current printer."""
         self.printername = printername
-        self.community = arguments[0]
-        self.oid = arguments[1]
+        args = [x.strip() for x in arguments.split(',')]
+        self.community = args[0]
+        self.oid = args[1]
         
     def getPrinterPageCounter(self, hostname) :