commit fe82e774ea203de277968216126e26d0d09b3a15
author Christian Heimes <christian@cheimes.de> Mon Jan 28 02:38:20 2008 +0000
committer Christian Heimes <christian@cheimes.de> Mon Jan 28 02:38:20 2008 +0000
tree fa12e8ce128288a56c0566d76aeaa05b8dd3e6d2
parent 26855635833fcd3f15786b4a9d4241ded293404c

Merged revisions 60379-60382 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r60381 | christian.heimes | 2008-01-28 03:07:53 +0100 (Mon, 28 Jan 2008) | 1 line

  static PyObject* variables should use PyString_InternFromString() instead of PyObject_FromString() to store a python string in a function level static var.
........

Modules/_ctypes/_ctypes.c

diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index 49f55c8..c10f627 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -1530,9 +1530,9 @@
 
 	if (suffix == NULL)
 #ifdef WORDS_BIGENDIAN
-		suffix = PyUnicode_FromString("_le");
+		suffix = PyUnicode_InternFromString("_le");
 #else
-		suffix = PyUnicode_FromString("_be");
+		suffix = PyUnicode_InternFromString("_be");
 #endif
 
 	newname = PyUnicode_Concat(name, suffix);
@@ -4276,7 +4276,7 @@
 	}
 
 	if (format == NULL) {
-		format = PyUnicode_FromString("%s(%r)");
+		format = PyUnicode_InternFromString("%s(%r)");
 		if (format == NULL)
 			return NULL;
 	}

Modules/_ctypes/callbacks.c

diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c
index 6a1d2b7..964af1b 100644
--- a/Modules/_ctypes/callbacks.c
+++ b/Modules/_ctypes/callbacks.c
@@ -365,7 +365,7 @@
 	static PyObject *context;
 
 	if (context == NULL)
-		context = PyUnicode_FromString("_ctypes.DllGetClassObject");
+		context = PyUnicode_InternFromString("_ctypes.DllGetClassObject");
 
 	mod = PyImport_ImportModuleNoBlock("ctypes");
 	if (!mod) {
@@ -444,7 +444,7 @@
 	static PyObject *context;
 
 	if (context == NULL)
-		context = PyUnicode_FromString("_ctypes.DllCanUnloadNow");
+		context = PyUnicode_InternFromString("_ctypes.DllCanUnloadNow");
 
 	mod = PyImport_ImportModuleNoBlock("ctypes");
 	if (!mod) {

Modules/mathmodule.c

diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c
index 873059f..baef569 100644
--- a/Modules/mathmodule.c
+++ b/Modules/mathmodule.c
@@ -131,7 +131,7 @@
 	PyObject *method;
 
 	if (ceil_str == NULL) {
-		ceil_str = PyUnicode_FromString("__ceil__");
+		ceil_str = PyUnicode_InternFromString("__ceil__");
 		if (ceil_str == NULL)
 			return NULL;
 	}
@@ -171,7 +171,7 @@
 	PyObject *method;
 
 	if (floor_str == NULL) {
-		floor_str = PyUnicode_FromString("__floor__");
+		floor_str = PyUnicode_InternFromString("__floor__");
 		if (floor_str == NULL)
 			return NULL;
 	}