[Python-modules-commits] r10696 - in packages/python-docutils/trunk/debian/patches (2 files)

[smcv at users.alioth.debian.org]

    Date: Monday, December 7, 2009 @ 01:46:16
  Author: smcv
Revision: 10696

Revert a change to buildhtml.py that broke buildhtml --local

Added:
  packages/python-docutils/trunk/debian/patches/17_revert_buildhtml.diff
Modified:
  packages/python-docutils/trunk/debian/patches/series

Added: packages/python-docutils/trunk/debian/patches/17_revert_buildhtml.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/17_revert_buildhtml.diff	                        (rev 0)
+++ packages/python-docutils/trunk/debian/patches/17_revert_buildhtml.diff	2009-12-07 01:46:16 UTC (rev 10696)
@@ -0,0 +1,40 @@
+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.
+---
+ 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
+

Modified: packages/python-docutils/trunk/debian/patches/series
===================================================================
--- packages/python-docutils/trunk/debian/patches/series	2009-12-07 01:20:32 UTC (rev 10695)
+++ packages/python-docutils/trunk/debian/patches/series	2009-12-07 01:46:16 UTC (rev 10696)
@@ -4,3 +4,4 @@
 14_use_setuptools.diff
 15_emacs_debian_paths.diff
 16_disable_picins.diff
+17_revert_buildhtml.diff