Merge branch 'master' into show_field_tabs

Author: dcwhite

.travis.yml

@@ -17,18 +17,6 @@ matrix:
       sudo: required
       compiler: clang
       env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF
-    - os: osx
-      osx_image: xcode7.2
-      env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF
-    - os: osx
-      osx_image: xcode8.3
-      env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF
-    - os: osx
-      osx_image: xcode9.3
-      env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF
-    - os: osx
-      osx_image: xcode10.1
-      env: PYTHON_VERSION=3.4.3 OSPRAY_BUILD=OFF
     - os: osx
       osx_image: xcode7.2
       env: PYTHON_VERSION=3.5.6 OSPRAY_BUILD=OFF
@@ -44,12 +32,6 @@ matrix:
     - os: osx
       osx_image: xcode7.2
       env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF
-    - os: osx
-      osx_image: xcode8.3
-      env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF
-    - os: osx
-      osx_image: xcode9.3
-      env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF
     - os: osx
       osx_image: xcode10.1
       env: PYTHON_VERSION=3.6.7 OSPRAY_BUILD=OFF

src/Core/Python/PythonInterpreter.cc

@@ -53,13 +53,7 @@
 #include <Core/Python/PythonInterpreter.h>
 
 #include <Dataflow/Engine/Python/SCIRunPythonModule.h>
-
-
-//#ifdef _MSC_VER
-//#pragma warning( pop )
-//#endif
-
-//#include <Interface/PythonTestGui/Python/ToPythonConverters.h>
+#include <Core/Logging/Log.h>
 
 using namespace SCIRun::Core;
 
@@ -506,6 +500,7 @@ void PythonInterpreter::print_banner()
 
 bool PythonInterpreter::run_string( const std::string& command )
 {
+  LOG_DEBUG("Python::run_string( {} )", command);
 	{
 		PythonInterpreterPrivate::lock_type lock( this->private_->get_mutex() );
 		if ( !this->private_->initialized_ )
@@ -582,6 +577,7 @@ bool PythonInterpreter::run_string( const std::string& command )
 
 void PythonInterpreter::run_script( const std::string& script )
 {
+  LOG_DEBUG("Python::run_script( {} )", script);
 	{
 		PythonInterpreterPrivate::lock_type lock( this->private_->get_mutex() );
 		if ( !this->private_->initialized_ )
@@ -627,6 +623,7 @@ void PythonInterpreter::run_script( const std::string& script )
 
 bool PythonInterpreter::run_file( const std::string& file_name )
 {
+  LOG_DEBUG("Python::run_file( {} )", file_name);
 	{
 		PythonInterpreterPrivate::lock_type lock( this->private_->get_mutex() );
 		if ( !this->private_->initialized_ )