remove temparory fix

Author: Tieqiong

src/diffpy/pdffit2/output.py

@@ -39,13 +39,4 @@ def redirect_stdout(dst):
     return
 
 
-def restore_stdout():
-    """Restore the standard output."""
-    from diffpy.pdffit2.pdffit2 import restore_stdout
-
-    restore_stdout()
-    global stdout
-    return
-
-
 #  End of file

src/extensions/pdffit2module/bindings.cc

@@ -330,10 +330,6 @@ struct PyMethodDef pypdffit2_methods[] = {
     {pypdffit2_redirect_stdout__name__, pypdffit2_redirect_stdout,
      METH_VARARGS, pypdffit2_redirect_stdout__doc__},
 
-    //restore_stdout
-    {pypdffit2_restore_stdout__name__, pypdffit2_restore_stdout,
-     METH_VARARGS, pypdffit2_restore_stdout__doc__},
-
     //is_element
     {pypdffit2_is_element__name__, pypdffit2_is_element,
      METH_VARARGS, pypdffit2_is_element__doc__},

src/extensions/pdffit2module/misc.cc

@@ -2201,36 +2201,6 @@ PyObject * pypdffit2_redirect_stdout(PyObject *, PyObject *args)
     return Py_None;
 }
 
-// restore_stdout
-char pypdffit2_restore_stdout__doc__[] =
-    "Restore engine output to the default stream (std::cout).";
-char pypdffit2_restore_stdout__name__[] =
-    "restore_stdout";
-
-PyObject * pypdffit2_restore_stdout(PyObject *, PyObject *args)
-{
-    // no arguments.
-    if (!PyArg_ParseTuple(args, ""))
-        return 0;
-
-    // If the global output stream pointer is not std::cout, then delete the custom stream.
-    if (NS_PDFFIT2::pout != &std::cout)
-    {
-        delete NS_PDFFIT2::pout;
-        NS_PDFFIT2::pout = &std::cout;
-    }
-
-    // Clean up the custom stream buffer
-    if (py_stdout_streambuf)
-    {
-        delete py_stdout_streambuf;
-        py_stdout_streambuf = nullptr;
-    }
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
 // is_element
 char pypdffit2_is_element__doc__[] = "Check if element or isotope is defined in the built-in periodic table.";
 char pypdffit2_is_element__name__[] = "is_element";

src/extensions/pdffit2module/misc.h

@@ -477,11 +477,6 @@ extern char pypdffit2_redirect_stdout__name__[];
 extern "C"
 PyObject * pypdffit2_redirect_stdout(PyObject *, PyObject *);
 
-// restore_stdout
-extern char pypdffit2_restore_stdout__doc__[];
-extern char pypdffit2_restore_stdout__name__[];
-extern "C"
-PyObject * pypdffit2_restore_stdout(PyObject *, PyObject *);
 
 // is_element
 extern char pypdffit2_is_element__doc__[];

tests/conftest.py

@@ -45,7 +45,6 @@ def _capture(f, *args, **kwargs):
             f(*args, **kwargs)
         finally:
             diffpy.pdffit2.redirect_stdout(savestdout)
-            diffpy.pdffit2.output.restore_stdout()
         return fp.getvalue()
 
     return _capture