openstack/zaqar
Code Issues Proposed changes

Merge "refactor: drop simplejson requirement"

Browse Source
This commit is contained in:
Jenkins 2013-11-27 16:48:50 +00:00 committed by Gerrit Code Review
commit 11660c2fca
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
marconi/queues/transport/utils.py
View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import simplejson as json import json
class MalformedJSON(ValueError): class MalformedJSON(ValueError):

2
marconi/queues/transport/validation.py
View File

@ -13,10 +13,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
import json
import re import re
from oslo.config import cfg from oslo.config import cfg
import simplejson as json
_TRANSPORT_LIMITS_OPTIONS = [ _TRANSPORT_LIMITS_OPTIONS = [

1
requirements.txt
View File

@ -9,7 +9,6 @@ msgpack-python
pymongo>=2.4 pymongo>=2.4
python-keystoneclient>=0.4.1 python-keystoneclient>=0.4.1
python-memcached python-memcached
simplejson>=2.0.9
WebOb>=1.2.3,<1.3 WebOb>=1.2.3,<1.3
stevedore>=0.10 stevedore>=0.10
six>=1.4.1 six>=1.4.1