[pywin32-checkins] /hgrepo/p/py/pywin32/pywin32: more fine-grained control over 3.x...

[<pyw...@li...>]

changeset 3becde564ef5 in /hgrepo/p/py/pywin32/pywin32
details: http://pywin32.hg.sourceforge.net/hgweb/pywin32/pywin32/hgrepo/p/py/pywin32/pywin32?cmd=changeset;node=3becde564ef5
summary: more fine-grained control over 3.x 'force' workaround and fix raw strings

diffstat:

 setup.cfg |  5 -----
 setup.py  |  9 ++++++++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (36 lines):

diff -r 159d252707cd -r 3becde564ef5 setup.cfg
--- a/setup.cfg	Mon Mar 14 10:32:03 2011 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-[build]
-force=1
-[bdist_wininst]
-user_access_control=auto
-
diff -r 159d252707cd -r 3becde564ef5 setup.py
--- a/setup.py	Mon Mar 14 10:32:03 2011 -0400
+++ b/setup.py	Sat Mar 19 15:20:09 2011 +1100
@@ -622,7 +622,14 @@
 if do_2to3:
     # Force 2to3 to be run for py3k versions.
     class my_build_py(build_py):
+        def finalize_options(self):
+            build_py.finalize_options(self)
+            # must force as the 2to3 conversion happens in place so an
+            # interrupted build can cause py2 syntax files in a py3k build.
+            self.force = True
+
         def run(self):
+            print "RUNNING", self.force
             self.updated_files = []
     
             # Base class code
@@ -1765,7 +1772,7 @@
                         %(win32com)s/extensions/PyIType.cpp                 %(win32com)s/extensions/PyITypeObjects.cpp
                         %(win32com)s/extensions/PyTYPEATTR.cpp              %(win32com)s/extensions/PyVARDESC.cpp
                         """ % dirs).split(),
-                   depends=("""
+                   depends=(r"""
                         %(win32com)s/include\propbag.h          %(win32com)s/include\PyComTypeObjects.h
                         %(win32com)s/include\PyFactory.h        %(win32com)s/include\PyGConnectionPoint.h
                         %(win32com)s/include\PyGConnectionPointContainer.h