Browse Source

Use built-in json module rather than external simplejson

simplejson was there for python <= 2.6 compatibility.
It's not needed now, and installing it with pip can lead to segfaults
because pip is dumb.
(see e.g. https://github.com/simplejson/simplejson/issues/114)
tags/nilmdb-2.0.0
Jim Paris 2 years ago
parent
commit
0b631b7dea
7 changed files with 6 additions and 7 deletions
  1. +1
    -1
      nilmdb/client/client.py
  2. +1
    -1
      nilmdb/client/httpclient.py
  3. +1
    -1
      nilmdb/server/server.py
  4. +1
    -1
      nilmdb/server/serverutil.py
  5. +0
    -1
      requirements.txt
  6. +1
    -1
      tests/test_client.py
  7. +1
    -1
      tests/test_nilmdb.py

+ 1
- 1
nilmdb/client/client.py View File

@@ -7,7 +7,7 @@ import nilmdb.client.httpclient
from nilmdb.client.errors import ClientError

import time
import simplejson as json
import json
import contextlib

from nilmdb.utils.time import timestamp_to_string, string_to_timestamp


+ 1
- 1
nilmdb/client/httpclient.py View File

@@ -3,7 +3,7 @@
import nilmdb.utils
from nilmdb.client.errors import ClientError, ServerError, Error

import simplejson as json
import json
import urllib.parse
import requests



+ 1
- 1
nilmdb/server/server.py View File

@@ -12,7 +12,7 @@ import cherrypy
import sys
import os
import socket
import simplejson as json
import json
import decorator
import psutil
import traceback


+ 1
- 1
nilmdb/server/serverutil.py View File

@@ -5,7 +5,7 @@ import cherrypy
import sys
import os
import decorator
import simplejson as json
import json

# Helper to parse parameters into booleans
def bool_param(s):


+ 0
- 1
requirements.txt View File

@@ -9,5 +9,4 @@ psutil>=5.6.3
python-datetime-tz>=0.5.4
python-dateutil>=2.8.0
requests>=2.22.0
simplejson>=3.16.0
tz>=0.2.2

+ 1
- 1
tests/test_client.py View File

@@ -18,7 +18,7 @@ import os
import sys
import threading
import io
import simplejson as json
import json
import unittest
import warnings
import resource


+ 1
- 1
tests/test_nilmdb.py View File

@@ -3,7 +3,7 @@ import nilmdb.server
from nose.tools import *
from nose.tools import assert_raises
import distutils.version
import simplejson as json
import json
import itertools
import os
import sys


Loading…
Cancel
Save