Changeset c0ca2e3d in sasview for run.py

Timestamp:

Apr 8, 2017 8:47:39 AM (7 years ago)

Author:

Ricardo Ferraz Leal <ricleal@…>

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

Children:

de99a5f0

Parents:

168d359 (diff), 959eb01 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

After merging conflict with master CR/LF

File:

• run.py (modified) (1 diff)

run.py

@@ -62 +62 @@
 def import_package(modname, path):
     """Import a package into a particular point in the python namespace"""
+    logger.debug("Dynamicly importing: %s", path)
     mod = imp.load_source(modname, abspath(joinpath(path,'__init__.py')))
     sys.modules[modname] = mod