Changeset 270cc72e in sasview


Ignore:
Timestamp:
Mar 11, 2012 4:20:23 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:
bd26a85
Parents:
0528cd6
Message:

ascii reader unicode encoding fixs (w/ py2exe)

Location:
sansview
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • sansview/sansview.py

    r6bdf6ae r270cc72e  
    2424        os.mkdir(mplconfigdir) 
    2525    os.environ['MPLCONFIGDIR'] = mplconfigdir 
    26  
     26    sys.setdefaultencoding("iso-8859-1") 
    2727from sans.guiframe import gui_manager 
    2828from sans.guiframe.gui_style import GUIFRAME 

  • sansview/setup_exe.py

    rcc37badc r270cc72e  
    5656                    "win32com.internet", "win32com.mapi", "win32com.propsys", 
    5757                    "win32com.taskscheduler"]: 
    58         __import__(extra) 
    59         m = sys.modules[extra] 
    60         for p in m.__path__[1:]: 
    61             modulefinder.AddPackagePath(extra, p) 
     58         
     59            __import__(extra) 
     60            m = sys.modules[extra] 
     61            for p in m.__path__[1:]: 
     62                modulefinder.AddPackagePath(extra, p) 
     63 
    6264except ImportError: 
    6365    # no build path setup, no worries. 
    … …  
    284286# packages 
    285287# 
    286 packages = ['matplotlib', 'scipy', 'pytz', 'encodings', 'comtypes', 'win32com'] 
     288packages = ['matplotlib', 'scipy', 'pytz', 'encodings', 'comtypes', 'win32com', 'encodings'] 
    287289includes = ['site'] 
    288290 

  • sansview/setup_mac.py

    rdac6869 r270cc72e  
    105105 
    106106OPTIONS = {'argv_emulation': True, 
    107            'packages': ['lxml','numpy', 'scipy', 'pytz',  
     107           'packages': ['lxml','numpy', 'scipy', 'pytz', 'encodings', 
    108108                        'encodings','matplotlib', 'periodictable'], 
    109109           'iconfile': ICON, 
Note: See TracChangeset for help on using the changeset viewer.