Commit 28bf7ffc authored by whitlocb's avatar whitlocb
Browse files

Fix a Python crash. Merge release notes.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@12413 18c085ea-50e0-402c-830e-de6fd14e8384
parent 7eb8d74a
......@@ -63,6 +63,7 @@ enhancements and bug-fixes that were added to this release.</p>
they too match the cells used in the originating plot's selection.
</li>
<li>The visit_writer library now supports voxels and pixels.</li>
<li>Support for variables defined on material subsets was added to the Silo plugin.</li>
</ul>
<a name="File_format"></a>
......@@ -76,6 +77,7 @@ enhancements and bug-fixes that were added to this release.</p>
<li>A <i>GULP</i> trajectory file format reader was added.</li>
<li>A <i>PuReMD</i> trajectory file format reader was added.</li>
<li>A <i>Silo</i> bug involving species data was resolved.</li>
<li>The <i>ITAPS</i> implemenation tarballs were all updated to ~ June, 2010</li>
</ul>
<a name="Plot_changes"></a>
......
......@@ -15344,6 +15344,9 @@ CloseExtensions()
// This allows these methods to be accessed from imported python modules
// if we are running the cli.
//
// Brad Whitlock, Wed Sep 1 15:26:17 PDT 2010
// Don't add to the visitModule if it wasn't created!
//
// ****************************************************************************
static void
......@@ -15393,21 +15396,24 @@ PlotPluginAddInterface()
Py_DECREF(v);
}
}
// make sure to add this method to the visitmodule dictionary
d = PyModule_GetDict(visitModule);
PyMethodDef *method = (PyMethodDef *)methods;
for(int j = 0; j < nMethods; ++j, ++method)
if(visitModule != 0)
{
debug1 << "\tAdded \"" << method->ml_name << "\" "
<< "method to the visitmodule dictionary." << endl;
// make sure to add this method to the visitmodule dictionary
d = PyModule_GetDict(visitModule);
PyMethodDef *method = (PyMethodDef *)methods;
for(int j = 0; j < nMethods; ++j, ++method)
{
debug1 << "\tAdded \"" << method->ml_name << "\" "
<< "method to the visitmodule dictionary." << endl;
// Add the method to the dictionary.
PyObject *v = PyCFunction_New(method, Py_None);
if(v == NULL)
continue;
if(PyDict_SetItemString(d, method->ml_name, v) != 0)
continue;
Py_DECREF(v);
// Add the method to the dictionary.
PyObject *v = PyCFunction_New(method, Py_None);
if(v == NULL)
continue;
if(PyDict_SetItemString(d, method->ml_name, v) != 0)
continue;
Py_DECREF(v);
}
}
}
}
......@@ -15440,6 +15446,9 @@ PlotPluginAddInterface()
// This allows these methods to be accessed from imported python modules
// if we are running the cli.
//
// Brad Whitlock, Wed Sep 1 15:26:17 PDT 2010
// Don't add to the visitModule if it wasn't created!
//
// ****************************************************************************
static void
......@@ -15489,21 +15498,24 @@ OperatorPluginAddInterface()
Py_DECREF(v);
}
}
// make sure to add this method to the visitmodule dictionary
d = PyModule_GetDict(visitModule);
PyMethodDef *method = (PyMethodDef *)methods;
for(int j = 0; j < nMethods; ++j, ++method)
if(visitModule != 0)
{
debug1 << "\tAdded \"" << method->ml_name << "\" "
<< "method to the visitmodule dictionary." << endl;
// make sure to add this method to the visitmodule dictionary
d = PyModule_GetDict(visitModule);
PyMethodDef *method = (PyMethodDef *)methods;
for(int j = 0; j < nMethods; ++j, ++method)
{
debug1 << "\tAdded \"" << method->ml_name << "\" "
<< "method to the visitmodule dictionary." << endl;
// Add the method to the dictionary.
PyObject *v = PyCFunction_New(method, Py_None);
if(v == NULL)
continue;
if(PyDict_SetItemString(d, method->ml_name, v) != 0)
continue;
Py_DECREF(v);
// Add the method to the dictionary.
PyObject *v = PyCFunction_New(method, Py_None);
if(v == NULL)
continue;
if(PyDict_SetItemString(d, method->ml_name, v) != 0)
continue;
Py_DECREF(v);
}
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment