Changeset 6d52ff44 in sasview

Timestamp:

Dec 6, 2011 11:41:27 AM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

b7cfa8d

Parents:

624cd3c3

Message:

Re #5 fixing installer build on mac

Files:

• calculatorview/src/sans/perspectives/calculator/__init__.py (modified) (2 diffs)
• fittingview/src/sans/perspectives/fitting/__init__.py (modified) (2 diffs)
• invariantview/src/sans/perspectives/invariant/__init__.py (modified) (2 diffs)
• sansview/setup_mac.py (modified) (1 diff)

calculatorview/src/sans/perspectives/calculator/__init__.py

@@ -1 +1 @@
 PLUGIN_ID = "Calculator plug-in 1.0"
-from calculator import *
-
 import os
-from distutils.filelist import findall
 
 N_DIR = 12
@@ -45 +42 @@
     data_files = []
     path = get_data_path(media="media")
-    for f in findall(path):
+    for f in os.listdir(path):
         data_files.append(('media/calculator_media', [f]))
     return data_files

fittingview/src/sans/perspectives/fitting/__init__.py

@@ -1 +1 @@
 PLUGIN_ID = "Fitting plug-in 1.0"
-from fitting import *
-from distutils.filelist import findall
 import os
 def get_data_path(media):
@@ -39 +37 @@
     data_files = []
     path = get_data_path(media="media")
-    for f in findall(path):
+    for f in os.listdir(path):
         data_files.append(('media/fitting_media', [f]))
     return data_files

invariantview/src/sans/perspectives/invariant/__init__.py

@@ -1 +1 @@
 PLUGIN_ID = "Invariant plug-in 1.0"
-from invariant import *
-
 import os
-from distutils.filelist import findall
 
 def get_data_path(media):
@@ -41 +38 @@
     data_files = []
     path = get_data_path(media="media")
-    for f in findall(path):
+    for f in os.listdir(path):
         data_files.append(('media/invariant_media', [f]))
     return data_files

sansview/setup_mac.py

@@ -14 +14 @@
 import periodictable.xsf
 import sans.dataloader.readers 
-from distutils.sysconfig import get_python_lib
 import os
 import string