diff octave_to_python.cc @ 347:7f039ffe501b

Store the _InOctave dict only in main * @pyobject/pyobject.m: Simplified _InOctave storage. * octave_to_python.cc: Rename _InOctave dict. * pytave_utils.cc: Rename _InOctave dict. * python_to_octave.cc: Simplified _InOctave storage.
author Colin Macdonald <cbm@m.fsf.org>
date Wed, 10 Aug 2016 11:34:19 -0700
parents 6bd8f5e3542a
children e89a8a37fd8a
line wrap: on
line diff
--- a/octave_to_python.cc	Tue Aug 16 16:08:43 2016 -0700
+++ b/octave_to_python.cc	Wed Aug 10 11:34:19 2016 -0700
@@ -190,8 +190,7 @@
       {
         octave_value_list tmp = feval ("getid", ovl (octvalue), 1);
         std::string hexid = tmp(0).string_value ();
-        // FIXME: added a messy ref to __InOct__ in __main__, find a better way
-        py_object = boost::python::import ("__main__").attr ("__InOct__")[hexid];
+        py_object = boost::python::import ("__main__").attr ("_InOctave")[hexid];
       }
     else
       throw value_convert_exception (