Kolab Groupware OBS

python-sievelib.spec Changed

debian.changelog Changed

python-sievelib.dsc Changed

sievelib-0.5.2.tar.gz/sievelib/digest_md5.py Changed

sievelib-0.5.2.tar.gz/sievelib/managesieve.py Changed

@@ -88,6 +88,7 @@
     def __dprint(self, message):
         if not self.__debug:
             return
+        print(message)
 
     def __read_block(self, size):
         """Read a block of 'size' bytes from the server.
@@ -114,8 +115,9 @@
             return buf
         try:
             buf += self.sock.recv(size)
-        except (socket.timeout, ssl.SSLError), e:
+        except (socket.timeout, ssl.SSLError) as err:
             raise Error("Failed to read %d bytes from the server" % size)
+        self.__dprint("S: %s" % buf)
         return buf
 
     def __read_line(self):
@@ -162,6 +164,7 @@
                 if m.group(1) == "NO":
                     self.__parse_error(m.group(2))
                 raise Response(m.group(1), m.group(2))
+        self.__dprint("S: %s" % ret)
         return ret
 
     def __read_response(self, nblines=-1):
@@ -182,11 +185,11 @@
         while True:
             try:
                 line = self.__read_line()
-            except Response, inst:
+            except Response as inst:
                 code = inst.code
                 data = inst.data
                 break
-            except Literal, inst:
+            except Literal as inst:
                 resp += self.__read_block(inst.value)
                 continue
             if not len(line):
@@ -235,7 +238,7 @@
         tosend = name
         if len(args):
             tosend += " " + " ".join(self.__prepare_args(args))
-        self.__dprint("Command: %s" % tosend)
+        self.__dprint("C: %s" % tosend)
         self.sock.send("%s%s" % (tosend, CRLF))
         for l in extralines:
             self.sock.send("%s%s" % (l, CRLF))
@@ -398,8 +401,8 @@
             return False
         try:
             nsock = ssl.wrap_socket(self.sock, keyfile, certfile)
-        except ssl.SSLError, e:
-            raise Error("SSL error: %s" % str(e))
+        except ssl.SSLError as err:
+            raise Error("SSL error: %s" % str(err))
         self.sock = nsock
         self.__capabilities = {}
         self.__get_capabilities()
@@ -463,7 +466,7 @@
             self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
             self.sock.connect((self.srvaddr, self.srvport))
             self.sock.settimeout(Client.read_timeout)
-        except socket.error, msg:
+        except socket.error as msg:
             raise Error("Connection to server failed: %s" % str(msg))
 
         if not self.__get_capabilities():

sievelib-0.5.2.tar.gz/sievelib/parser.py Changed

@@ -105,7 +105,7 @@
         if not self.debug:
             return
         for m in msgs:
-            print m
+            print(m)
 
     def __reset_parser(self):
         """Reset parser's internal variables
@@ -392,8 +392,8 @@
                 raise ParseError("end of script reached while %s expected" % \
                                      "|".join(self.__expected))
 
-        except (ParseError, UnknownCommand, BadArgument, BadValue), e:
-            self.error = "line %d: %s" % (self.lexer.curlineno(), str(e))
+        except (ParseError, UnknownCommand, BadArgument, BadValue) as err:
+            self.error = "line %d: %s" % (self.lexer.curlineno(), str(err))
             return False
         return True
 
@@ -430,17 +430,17 @@
     options, args = op.parse_args()
 
     if not len(args):
-        print "Nothing to parse, exiting."
+        print("Nothing to parse, exiting.")
         sys.exit(0)
 
     for a in args:
         p = Parser(debug=options.debug)
-        print "Parsing file %s... " % a,
+        print("Parsing file %s... " % (a))
         if p.parse_file(a):
-            print "OK"
+            print("OK")
             if options.verbose:
                 p.dump()
             continue
-        print "ERROR"
-        print p.error
+        print("ERROR")
+        print(p.error)

Changes of Revision 5