Intern static string

tiran · tiran · commit c8a0d2f36840 · 2008-05-06T16:18:41.000Z
Use float constructors instead of magic code for float constants
diff --git a/Lib/json/decoder.py b/Lib/json/decoder.py
@@ -14,17 +14,7 @@
 
 FLAGS = re.VERBOSE | re.MULTILINE | re.DOTALL
 
-
-def _floatconstants():
-    import struct
-    import sys
-    _BYTES = '7FF80000000000007FF0000000000000'.decode('hex')
-    if sys.byteorder != 'big':
-        _BYTES = _BYTES[:8][::-1] + _BYTES[8:][::-1]
-    nan, inf = struct.unpack('dd', _BYTES)
-    return nan, inf, -inf
-
-NaN, PosInf, NegInf = _floatconstants()
+NaN, PosInf, NegInf = float('nan'), float('inf'), float('-inf')
 
 
 def linecol(doc, pos):
diff --git a/Modules/_json.c b/Modules/_json.c
@@ -215,7 +215,7 @@ join_list_unicode(PyObject *lst)
         ustr = PyUnicode_FromUnicode(&c, 0);
     }
     if (joinstr == NULL) {
-        joinstr = PyString_FromString("join");
+        joinstr = PyString_InternFromString("join");
     }
     if (joinstr == NULL || ustr == NULL) {
         return NULL;

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ join_list_unicode(PyObject *lst)`
`215`	`215`	`ustr = PyUnicode_FromUnicode(&c, 0);`
`216`	`216`	`}`
`217`	`217`	`if (joinstr == NULL) {`
`218`		`- joinstr = PyString_FromString("join");`
	`218`	`+ joinstr = PyString_InternFromString("join");`
`219`	`219`	`}`
`220`	`220`	`if (joinstr == NULL \|\| ustr == NULL) {`
`221`	`221`	`return NULL;`