diff options
| author | Zack M. Davis <zdavis@swiftstack.com> | 2015-10-30 11:02:54 -0700 |
|---|---|---|
| committer | Zack M. Davis <zdavis@swiftstack.com> | 2015-11-16 12:34:24 -0800 |
| commit | 1b8b08039a3647ffdb30225b0939055982942159 (patch) | |
| tree | 16c874ac8cbd5dbfe2b482a02c3fc7fb945730d4 /requirements.txt | |
| parent | c03d53ab7737e208d9c436088e41f60fdab96b30 (diff) | |
| download | swift-1b8b08039a3647ffdb30225b0939055982942159.tar.gz | |
remove remaining simplejson uses, prefer standard library import
a1c32702, 736cf54a, and 38787d0f remove uses of `simplejson` from
various parts of Swift in favor of the standard libary `json`
module (introduced in Python 2.6). This commit performs the remaining
`simplejson` to `json` replacements, removes two comments highlighting
quirks of simplejson with respect to Unicode, and removes the references
to it in setup documentation and requirements.txt.
There were a lot of places where we were importing json from
swift.common.utils, which is less intuitive than a direct `import json`,
so that replacement is made as well.
(And in two more tiny drive-bys, we add some pretty-indenting to an XML
fragment and use `super` rather than naming a base class explicitly.)
Change-Id: I769e88dda7f76ce15cf7ce930dc1874d24f9498a
Diffstat (limited to 'requirements.txt')
| -rw-r--r-- | requirements.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/requirements.txt b/requirements.txt index bac2dd236..afbbe17b0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,6 @@ eventlet>=0.16.1,!=0.17.0 greenlet>=0.3.1 netifaces>=0.5,!=0.10.0,!=0.10.1 pastedeploy>=1.3.3 -simplejson>=2.0.9 six>=1.9.0 xattr>=0.4 PyECLib==1.0.7 # BSD |