[PATCH 6 of 7] setup: always convert all files with 2to3 (fix for python bug)

Simon Heimberg simohe at besonet.ch
Tue Nov 8 16:36:12 CST 2011


# HG changeset patch
# User Simon Heimberg <simohe at besonet.ch>
# Date 1320184341 -3600
# Node ID 468445b534f7584d6ec08c689a8989e96e551f89
# Parent  52ba1200de770ab5bb2c600f03ee9eca4a77ac4c
setup: always convert all files with 2to3 (fix for python bug)

in setup3k the issue was fixed in the run method

diff -r 52ba1200de77 -r 468445b534f7 setup.py
--- a/setup.py	Son Aug 21 15:23:43 2011 +0200
+++ b/setup.py	Die Nov 01 22:52:21 2011 +0100
@@ -301,6 +301,14 @@
             else:
                 yield module
 
+    def build_module(self, module, module_file, package):
+        res = build_py.build_module(self, module, module_file, package)
+        if res[1] == 0 and getattr(self, 'updated_files', None) is not None \
+           and (self.updated_files == [] or self.updated_files[-1] != res[0]):
+            # fix for python bug 13316
+            self.updated_files.append(res[0])
+        return res
+
 class buildhgextindex(Command):
     description = 'generate prebuilt index of hgext (for frozen package)'
     user_options = []


More information about the Mercurial-devel mailing list