Merge from 3.x: PR #4799

Fixes #4797
spyder-ide · Jul 25, 2017 · d5d489e · d5d489e
2 parents 77afb4b + f38444a
commit d5d489e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 159 deletions.
diff --git a/create_exe.py b/create_exe.py
@@ -37,8 +37,7 @@ def create_executable():
         dist.add_modules('guiqwt')
     except ImportError:
         pass
-    dist.includes += ['spyder.scientific_startup',
-                      'spyder.widgets.externalshell.sitecustomize']
+    dist.includes += ['spyder.utils.site.sitecustomize']
 
     #XXX: ...until we are able to distribute them (see guidata.disthelpers)
     dist.excludes += ['sphinx', 'zmq', 'IPython']

diff --git a/spyder/config/base.py b/spyder/config/base.py
@@ -189,9 +189,6 @@ def is_py2exe_or_cx_Freeze():
     return osp.isfile(osp.join(get_module_path('spyder'), osp.pardir))
 
 
-SCIENTIFIC_STARTUP = get_module_source_path('spyder', 'scientific_startup.py')
-
-
 #==============================================================================
 # Image path list
 #==============================================================================

diff --git a/spyder/scientific_startup.py b/spyder/scientific_startup.py