[Python-modules-commits] r13898 - in packages/python-docutils/trunk/debian (4 files)

[jwilk at users.alioth.debian.org]

    Date: Sunday, July 11, 2010 @ 12:06:02
  Author: jwilk
Revision: 13898

Replace patch to fix --local option for tools/buildhtml.py with the one that was applied upstream.

Added:
  packages/python-docutils/trunk/debian/patches/buildhtml-local.diff
    (from rev 12594, packages/python-docutils/trunk/debian/patches/17_revert_buildhtml.diff)
Modified:
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/patches/series
Deleted:
  packages/python-docutils/trunk/debian/patches/17_revert_buildhtml.diff

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2010-07-11 11:15:26 UTC (rev 13897)
+++ packages/python-docutils/trunk/debian/changelog	2010-07-11 12:06:02 UTC (rev 13898)
@@ -1,3 +1,11 @@
+python-docutils (0.7-2) UNRELEASED; urgency=low
+
+  * Replace patch to fix --local option for tools/buildhtml.py
+    (17_revert_buildhtml.diff) with the one that was applied upstream
+    (buildhtml-local.diff).
+
+ -- Jakub Wilk <jwilk at debian.org>  Fri, 09 Jul 2010 15:28:05 +0200
+
 python-docutils (0.7-1) experimental; urgency=low
 
   * New upstream release.

Deleted: packages/python-docutils/trunk/debian/patches/17_revert_buildhtml.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/17_revert_buildhtml.diff	2010-07-11 11:15:26 UTC (rev 13897)
+++ packages/python-docutils/trunk/debian/patches/17_revert_buildhtml.diff	2010-07-11 12:06:02 UTC (rev 13898)
@@ -1,42 +0,0 @@
-From 76dbf3efc4cf512d3601f3431f04ca221e21397b Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv at debian.org>
-Date: Mon, 7 Dec 2009 01:37:58 +0000
-Subject: [PATCH] Revert a change to buildhtml.py that broke --local
-
-The --local option relies on the semantics of os.path.walk, and can't
-be adapted to os.walk quite this easily.
-
-Forwarded: https://sourceforge.net/tracker/?func=detail&aid=2909811&group_id=38414&atid=422030
----
- tools/buildhtml.py |    9 ++-------
- 1 files changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/tools/buildhtml.py b/tools/buildhtml.py
-index a5ac8b9..654800e 100755
---- a/tools/buildhtml.py
-+++ b/tools/buildhtml.py
-@@ -1,6 +1,6 @@
- #!/usr/bin/env python
- 
--# $Id: buildhtml.py 5741 2008-12-01 07:21:03Z grubert $
-+# $Id: buildhtml.py 5019 2007-03-12 21:48:30Z wiemann $
- # Author: David Goodger <goodger at python.org>
- # Copyright: This module has been placed in the public domain.
- 
-@@ -181,12 +181,7 @@ class Builder:
-         else:
-             self.directories = [os.getcwd()]
-         for directory in self.directories:
--            try:
--                for root, dirs, files in os.walk(directory):
--                    self.visit(recurse, root, dirs+files)
--            except (AttributeError): # python2.2 does not have os.walk
--                print "no os.walk"
--                os.path.walk(directory, self.visit, recurse)
-+            os.path.walk(directory, self.visit, recurse)
- 
-     def visit(self, recurse, directory, names):
-         settings = self.get_settings('', directory)
--- 
-1.6.5.4
-

Copied: packages/python-docutils/trunk/debian/patches/buildhtml-local.diff (from rev 12594, packages/python-docutils/trunk/debian/patches/17_revert_buildhtml.diff)
===================================================================
--- packages/python-docutils/trunk/debian/patches/buildhtml-local.diff	                        (rev 0)
+++ packages/python-docutils/trunk/debian/patches/buildhtml-local.diff	2010-07-11 12:06:02 UTC (rev 13898)
@@ -0,0 +1,38 @@
+Description: Fix --local option for tools/buildhtml.py.
+Origin: upstream, http://svn.berlios.de/viewvc/docutils/trunk/docutils/tools/buildhtml.py?r1=6366&r2=6371
+Bug: http://sourceforge.net/tracker/?func=detail&aid=2909811&group_id=38414&atid=422030
+Last-Update: 2010-07-11
+
+--- a/tools/buildhtml.py
++++ b/tools/buildhtml.py
+@@ -181,14 +181,14 @@
+         else:
+             self.directories = [os.getcwd()]
+         for directory in self.directories:
+-            try:
+-                for root, dirs, files in os.walk(directory):
+-                    self.visit(recurse, root, dirs+files)
+-            except (AttributeError): # python2.2 does not have os.walk
+-                print "no os.walk"
+-                os.path.walk(directory, self.visit, recurse)
++            for root, dirs, files in os.walk(directory):
++                # os.walk by default this recurses down the tree,
++                # influence by modifying dirs.
++                if not recurse:
++                    del dirs[:]
++                self.visit(root, dirs+files)
+ 
+-    def visit(self, recurse, directory, names):
++    def visit(self, directory, names):
+         settings = self.get_settings('', directory)
+         if settings.prune and (os.path.abspath(directory) in settings.prune):
+             print >>sys.stderr, '/// ...Skipping directory (pruned):', directory
+@@ -211,8 +211,6 @@
+                 prune = self.process_txt(directory, name)
+                 if prune:
+                     break
+-        if not recurse:
+-            del names[:]
+ 
+     def process_txt(self, directory, name):
+         if name.startswith('pep-'):

Modified: packages/python-docutils/trunk/debian/patches/series
===================================================================
--- packages/python-docutils/trunk/debian/patches/series	2010-07-11 11:15:26 UTC (rev 13897)
+++ packages/python-docutils/trunk/debian/patches/series	2010-07-11 12:06:02 UTC (rev 13898)
@@ -7,4 +7,4 @@
 emacs-shell-quote.diff
 15_emacs_debian_paths.diff
 16_disable_picins.diff
-17_revert_buildhtml.diff
+buildhtml-local.diff