Changeset bd26a85 in sasview

Timestamp:

Mar 12, 2012 12:12:21 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

ed2d86e

Parents:

270cc72e

Message:

win32com also works now on 2.7

File:

• sansview/setup_exe.py (modified) (4 diffs)

sansview/setup_exe.py

@@ -39 +39 @@
 # Solution taken from here: http://www.py2exe.org/index.cgi/win32com.shell
 # ModuleFinder can't handle runtime changes to __path__, but win32com uses them
+win32_folder = "win32com"
+if sys.version_info >= (2, 7) or sys.version_info < (2, 6):
+    win32_folder = "win32comext"
 try:
     # py2exe 0.6.4 introduced a replacement modulefinder.
@@ -51 +54 @@
     import win32com, sys
     for p in win32com.__path__[1:]:
-        modulefinder.AddPackagePath("win32com", p)
+        modulefinder.AddPackagePath(win32_folder, p)
     for extra in ["win32com.shell", "win32com.adsi", "win32com.axcontrol",
                     "win32com.axscript", "win32com.bits", "win32com.ifilter",
@@ -286 +289 @@
 # packages
 #
-packages = ['matplotlib', 'scipy', 'pytz', 'encodings', 'comtypes', 'win32com', 'encodings']
+packages = ['matplotlib', 'scipy', 'pytz', 'encodings', 'comtypes', 'win32com']
 includes = ['site']
 
@@ -318 +321 @@
     windows=[target_wx_client],
     console=[],
-    
     options={
         'py2exe': {