diff options
| author | Brett Cannon <bcannon@gmail.com> | 2008-05-05 20:21:38 (GMT) |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2008-05-05 20:21:38 (GMT) |
| commit | 4b964f9c904744b7d7d88054e54a2e4ca8aeb395 (patch) | |
| tree | c24ba51492fc3fc714c54f2e671f21172d063908 /PC | |
| parent | 5f2e0e5ccb988cdf65137034b33ee57198cc23b9 (diff) | |
| download | cpython-4b964f9c904744b7d7d88054e54a2e4ca8aeb395.zip cpython-4b964f9c904744b7d7d88054e54a2e4ca8aeb395.tar.gz cpython-4b964f9c904744b7d7d88054e54a2e4ca8aeb395.tar.bz2 | |
Add the 'json' package. Code taken from simplejson 1.9 and contributed by Bob
Ippolito.
Closes issue #2750.
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 3d80857..803a225 100644 --- a/PC/VC6/pythoncore.dsp +++ b/PC/VC6/pythoncore.dsp @@ -149,6 +149,10 @@ SOURCE=..\..\Modules\_hotshot.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 4d7943b..ce736f3 100644 --- a/PC/VS7.1/pythoncore.vcproj +++ b/PC/VS7.1/pythoncore.vcproj @@ -380,6 +380,9 @@ RelativePath="..\..\Modules\_hotshot.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 624cf4d..45deec7 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 0d19caf..f128382 100644 --- a/PC/config.c +++ b/PC/config.c @@ -54,6 +54,7 @@ extern void init_struct(void); extern void initdatetime(void); extern void init_fileio(void); extern void init_functools(void); +extern void init_json(void); extern void initzlib(void); extern void init_multibytecodec(void); @@ -132,6 +133,7 @@ struct _inittab _PyImport_Inittab[] = { {"datetime", initdatetime}, {"_fileio", init_fileio}, {"_functools", init_functools}, + {"_json", init_json}, {"xxsubtype", initxxsubtype}, {"zipimport", initzipimport}, |