[Python-modules-commits] r13955 - in packages/parallelpython/trunk/debian (2 files)

[morph at users.alioth.debian.org]

    Date: Thursday, July 15, 2010 @ 16:56:51
  Author: morph
Revision: 13955

* debian/patches/10_remove_default_password.dpatch
  - adapted to new upstream code

Modified:
  packages/parallelpython/trunk/debian/changelog
  packages/parallelpython/trunk/debian/patches/10_remove_default_password.dpatch

Modified: packages/parallelpython/trunk/debian/changelog
===================================================================
--- packages/parallelpython/trunk/debian/changelog	2010-07-15 15:59:10 UTC (rev 13954)
+++ packages/parallelpython/trunk/debian/changelog	2010-07-15 16:56:51 UTC (rev 13955)
@@ -3,8 +3,10 @@
   * New upstream release
   * debian/copyright
     - updated both upstream and packaging copyright years
+  * debian/patches/10_remove_default_password.dpatch
+    - adapted to new upstream code
 
- -- Sandro Tosi <morph at debian.org>  Mon, 12 Jul 2010 23:40:50 +0200
+ -- Sandro Tosi <morph at debian.org>  Thu, 15 Jul 2010 18:55:09 +0200
 
 parallelpython (1.5.7-1) unstable; urgency=low
 

Modified: packages/parallelpython/trunk/debian/patches/10_remove_default_password.dpatch
===================================================================
--- packages/parallelpython/trunk/debian/patches/10_remove_default_password.dpatch	2010-07-15 15:59:10 UTC (rev 13954)
+++ packages/parallelpython/trunk/debian/patches/10_remove_default_password.dpatch	2010-07-15 16:56:51 UTC (rev 13955)
@@ -6,10 +6,10 @@
 ## DP: explicitly write one; it updates the documentation along the source code
 
 @DPATCH@
-diff -urNad parallelpython~/doc/ppdoc.html parallelpython/doc/ppdoc.html
---- parallelpython~/doc/ppdoc.html	2009-02-23 10:00:09.000000000 +0100
-+++ parallelpython/doc/ppdoc.html	2009-10-31 21:42:03.434067812 +0100
-@@ -42,7 +42,7 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' parallelpython~/doc/ppdoc.html parallelpython/doc/ppdoc.html
+--- parallelpython~/doc/ppdoc.html	2010-07-11 09:29:04.000000000 +0200
++++ parallelpython/doc/ppdoc.html	2010-07-15 18:47:28.987525212 +0200
+@@ -43,7 +43,7 @@
  -s secret          : secret for authentication
  -t seconds         : timeout to exit if no connections with clients exist
  </pre>
@@ -18,18 +18,18 @@
  
  			</td>
  		</tr>
-diff -urNad parallelpython~/pp.py parallelpython/pp.py
---- parallelpython~/pp.py	2009-02-24 07:34:00.000000000 +0100
-+++ parallelpython/pp.py	2009-10-31 21:42:03.434067812 +0100
-@@ -274,7 +274,6 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' parallelpython~/pp.py parallelpython/pp.py
+--- parallelpython~/pp.py	2010-05-30 08:10:29.000000000 +0200
++++ parallelpython/pp.py	2010-07-15 18:52:16.612523852 +0200
+@@ -285,7 +285,6 @@
      """
  
      default_port = 60000
 -    default_secret = "epo20pdosl;dksldkmm"
  
      def __init__(self, ncpus="autodetect", ppservers=(), secret=None,
-             loglevel=logging.WARNING, logstream=sys.stderr,
-@@ -286,9 +285,8 @@
+             restart=False, proto=2):
+@@ -296,9 +295,8 @@
                     the number of processors in the system
             ppservers - list of active parallel python execution servers
                     to connect with
@@ -37,22 +37,16 @@
 -                   passphrase will be used. It's highly recommended to use a
 -                   custom passphrase for all network connections.
 +           secret - passphrase for network connections; it can be set via
-+                    command-line or configuration file
-            loglevel - logging level
-            logstream - log stream destination
++                   command-line or configuration file
             restart - wheather to restart worker process after each task completion
-@@ -360,12 +358,12 @@
+            proto - protocol number for pickle module
+ 
+@@ -372,7 +370,7 @@
                  raise TypeError("secret must be of a string type")
              self.secret = str(secret)
-         elif hasattr(user, "pp_secret"):
--            secret = user["pp_secret"]
-+            secret = user.pp_secret
-             if not isinstance(secret, types.StringType):
-                 raise TypeError("secret must be of a string type")
-             self.secret = str(secret)
          else:
 -            self.secret = Server.default_secret
 +            raise ValueError("secret must be set using command-line option or configuration file")
          self.__connect()
          self.__creation_time = time.time()
-         logging.info("pp local server started with %d workers"
+         self.logger.info("pp local server started with %d workers"