Merge lp:~lasall/python-distutils-extra/fixbug-893337 into lp:python-distutils-extra

[Dominique Lasserre]

Hi, this should close #893337.

[Martin Pitt (pitti)]

This has some bugs (iterates through all the lines, not just until the decision is made), calls src_mark several times, and reads the whole file into memory. It also needs a test case.

But I do agree that this should get fixed. Thanks for the initial patch!

review: Needs Fixing

[Martin Pitt (pitti)]

Also, I think it's still ok to require that a manpage starts with .TH, but we should ignore all .\ lines before it.

[Martin Pitt (pitti)]

Merged and fixed. Thanks!

[Dominique Lasserre (lasall)]

Hi Martin, thank you for your comments about the fix! And your fix of the fix. ;)

=== modified file 'DistUtilsExtra/auto.py'
--- DistUtilsExtra/auto.py	2012-08-15 09:16:33 +0000
+++ DistUtilsExtra/auto.py	2012-08-16 23:48:04 +0000
@@ -320,10 +320,12 @@
 
     mans = {}
     for f in src_fileglob(src, '*.[0123456789]'):
-        line = open(f).readline()
-        if line.startswith('.TH '):
-            src_mark(src, f)
-            mans.setdefault(f[-1], []).append(f)
+        for line in open(f).readlines():
+            if line.startswith('.\"'):
+                continue
+            if line.startswith('.TH '):
+                src_mark(src, f)
+                mans.setdefault(f[-1], []).append(f)
     v = attrs.setdefault('data_files', [])
     for section, files in mans.items():
         v.append((os.path.join('share', 'man', 'man' + section), files))