Changeset d66dbcc in sasview

Timestamp:

May 2, 2017 7:17:05 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

2f6d340

Parents:

914ba0a

Message:

complete the merge

Files:

• sasview/setup_mac.py (modified) (3 diffs)
• setup.py (modified) (2 diffs)
• src/sas/sasgui/guiframe/documentation_window.py (modified) (1 diff)
• src/sas/sasview/welcome_panel.py (modified) (1 diff)

sasview/setup_mac.py

@@ -11 +11 @@
    12/05/2011: Needs macholib >= 1.4.3 and py2app >= 0.6.4 to create a 64-bit app
 """
-from setuptools import setup
+from __future__ import print_function
+
 import os
 import string
 import sys
-#Extending recursion limit
-sys.setrecursionlimit(10000)
-
-import macholib_patch
 
 from distutils.util import get_platform
 from distutils.filelist import findall
 from distutils.sysconfig import get_python_lib
+
+from setuptools import setup
+
+import macholib_patch
+
 root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-platform = '%s-%s'%(get_platform(),sys.version[:3])
+platform = '%s-%s'%(get_platform(), sys.version[:3])
 doc_path = os.path.join(root, 'build', 'lib.'+platform, 'doc')
 env = os.path.join(root, 'sasview-install', 'lib', 'python2.7', 'site-packages')
 #sys.path.insert(0, env)
 
-print "BUILDING PATH INSIDE", env
+#Extending recursion limit
+sys.setrecursionlimit(10000)
+
+print("BUILDING PATH INSIDE", env)
 
 from sas.sasview import local_config
@@ -60 +65 @@
 custom_config_file = os.path.join(sasview_path, 'custom_config.py')
 local_config_file = os.path.join(sasview_path, 'local_config.py')
+logging_ini = os.path.join(sasview_path, 'logging.ini')
 DATA_FILES.append(('.', [custom_config_file]))
 DATA_FILES.append(('config', [custom_config_file]))
 DATA_FILES.append(('.', [local_config_file]))
+DATA_FILES.append(('.', [logging_ini]))
 
 # default_categories.json is beside the config files
@@ -111 +118 @@
 
 # See if the documentation has been built, and if so include it.
-print doc_path
+print(doc_path)
 if os.path.exists(doc_path):
     for dirpath, dirnames, filenames in os.walk(doc_path):

setup.py

@@ -6 +6 @@
     TODO: Add checks to see that all the dependencies are on the system
 """
+from __future__ import print_function
 
 import os
@@ -66 +67 @@
 
 if os.path.exists(SASVIEW_BUILD):
-    print "Removing existing build directory", SASVIEW_BUILD, "for a clean build"
+    print("Removing existing build directory", SASVIEW_BUILD, "for a clean build")
     shutil.rmtree(SASVIEW_BUILD)
 

src/sas/sasgui/guiframe/documentation_window.py

@@ -1 @@
-"""
-documentation module provides a simple means to add help throughout the
-application. It checks for the existence of html2 package needed to support
-fully html panel which supports css.  The class defined here takes a title for
-the particular help panel, a pointer to the html documentation file of interest
-within the documentation tree along with a 'command' string such as a page
-anchor or a query string etc.  The path to the doc directory is retrieved
-automatically by the class itself.  Thus with these three pieces of information
-the class generates a panel with the appropriate title bar and help file
-formatted according the style sheets called in the html file.  Finally, if an
-old version of Python is running and the html2 package is not available the
-class brings up the default browser and passes the file:/// string to it.  In
-this case however the instruction portion is usually not passed for security
-reasons.
-"""
-import os
-import logging
-import urllib
-
-import webbrowser
-import wx
-
-from sas.sasgui import get_app_dir
-
-SPHINX_DOC_ENV = "SASVIEW_DOC_PATH"
-WX_SUPPORTS_HTML2 = True
-try:
-    import wx.html2 as html
-except:
-    WX_SUPPORTS_HTML2 = False
-
-
-=======
 """
 documentation module provides a simple means to add help throughout the

src/sas/sasview/welcome_panel.py

@@ -73 +73 @@
         """
         self.frame = frame
-        if frame != None:
+        if frame is not None:
             self.frame.Bind(wx.EVT_CLOSE, self.on_close_page)