diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-05-08 14:29:10 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-05-08 14:29:10 (GMT) |
| commit | 90540004d3e1cbc0bd5595838bca3d1970198120 (patch) | |
| tree | 9006c98a1c71cf39761d3eb35d4c227540b24947 /PC | |
| parent | c848655eb05c38f9c31bca0df87f2013670a1efa (diff) | |
| download | cpython-90540004d3e1cbc0bd5595838bca3d1970198120.zip cpython-90540004d3e1cbc0bd5595838bca3d1970198120.tar.gz cpython-90540004d3e1cbc0bd5595838bca3d1970198120.tar.bz2 | |
Merged revisions 62734,62736,62748,62769 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62734 | brett.cannon | 2008-05-05 22:21:38 +0200 (Mon, 05 May 2008) | 5 lines
Add the 'json' package. Code taken from simplejson 1.9 and contributed by Bob
Ippolito.
Closes issue #2750.
........
r62736 | georg.brandl | 2008-05-05 22:53:39 +0200 (Mon, 05 May 2008) | 2 lines
Fix JSON module docs.
........
r62748 | benjamin.peterson | 2008-05-06 04:51:10 +0200 (Tue, 06 May 2008) | 2 lines
PEP 8 nits in json package
........
r62769 | christian.heimes | 2008-05-06 18:18:41 +0200 (Tue, 06 May 2008) | 2 lines
Intern static string
Use float constructors instead of magic code for float constants
........
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/VC6/pythoncore.dsp | 4 | ||||
| -rw-r--r-- | PC/VS7.1/pythoncore.vcproj | 3 | ||||
| -rw-r--r-- | PC/VS8.0/pythoncore.vcproj | 4 | ||||
| -rw-r--r-- | PC/config.c | 2 |
4 files changed, 13 insertions, 0 deletions
diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp index 969e9df..9a369f2 100644 --- a/PC/VC6/pythoncore.dsp +++ b/PC/VC6/pythoncore.dsp @@ -145,6 +145,10 @@ SOURCE=..\..\Modules\_heapqmodule.c # End Source File
# Begin Source File
+SOURCE=..\..\Modules\_json.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\Modules\_localemodule.c
# End Source File
# Begin Source File
diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj index cc46faf..f06d626 100644 --- a/PC/VS7.1/pythoncore.vcproj +++ b/PC/VS7.1/pythoncore.vcproj @@ -377,6 +377,9 @@ RelativePath="..\..\Modules\_heapqmodule.c"> </File> <File + RelativePath="..\..\Modules\json.c"> + </File> + <File RelativePath="..\..\Modules\_localemodule.c"> </File> <File diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj index 4ff3028..8e59dae 100644 --- a/PC/VS8.0/pythoncore.vcproj +++ b/PC/VS8.0/pythoncore.vcproj @@ -1003,6 +1003,10 @@ >
</File>
<File
+ RelativePath="..\..\Modules\_json.c"
+ >
+ </File>
+ <File
RelativePath="..\..\Modules\_localemodule.c"
>
</File>
diff --git a/PC/config.c b/PC/config.c index f3e2eaa..e3bbde7 100644 --- a/PC/config.c +++ b/PC/config.c @@ -46,6 +46,7 @@ extern void init_winreg(void); extern void init_struct(void); extern void initdatetime(void); extern void init_functools(void); +extern void init_json(void); extern void initzlib(void); extern void init_multibytecodec(void); @@ -119,6 +120,7 @@ struct _inittab _PyImport_Inittab[] = { {"_struct", init_struct}, {"datetime", initdatetime}, {"_functools", init_functools}, + {"_json", init_json}, {"xxsubtype", initxxsubtype}, {"zipimport", initzipimport}, |