diff --git a/build/upload_assets.py b/build/upload_assets.py index 5ba6d6b89..b33ff9f31 100644 --- a/build/upload_assets.py +++ b/build/upload_assets.py @@ -1,5 +1,5 @@ import glob -import simplejson as json +import json import os import subprocess import sys diff --git a/lbrynet/conf.py b/lbrynet/conf.py index e9ae8acec..01b3f22f7 100644 --- a/lbrynet/conf.py +++ b/lbrynet/conf.py @@ -1,5 +1,5 @@ import base58 -import simplejson as json +import json import logging import os import re diff --git a/lbrynet/core/StreamDescriptor.py b/lbrynet/core/StreamDescriptor.py index a18ef7d02..0d0b2a4c2 100644 --- a/lbrynet/core/StreamDescriptor.py +++ b/lbrynet/core/StreamDescriptor.py @@ -1,6 +1,6 @@ import binascii from collections import defaultdict -import simplejson as json +import json import logging from twisted.internet import threads, defer diff --git a/lbrynet/core/client/ClientProtocol.py b/lbrynet/core/client/ClientProtocol.py index 3844bcb7a..755f6194e 100644 --- a/lbrynet/core/client/ClientProtocol.py +++ b/lbrynet/core/client/ClientProtocol.py @@ -1,4 +1,4 @@ -import simplejson as json +import json import logging from decimal import Decimal from twisted.internet import error, defer diff --git a/lbrynet/core/server/ServerRequestHandler.py b/lbrynet/core/server/ServerRequestHandler.py index 8c46170b9..3ed65023e 100644 --- a/lbrynet/core/server/ServerRequestHandler.py +++ b/lbrynet/core/server/ServerRequestHandler.py @@ -1,4 +1,4 @@ -import simplejson as json +import json import logging from twisted.internet import defer diff --git a/lbrynet/core/system_info.py b/lbrynet/core/system_info.py index b2c9092cb..12755033b 100644 --- a/lbrynet/core/system_info.py +++ b/lbrynet/core/system_info.py @@ -1,7 +1,5 @@ -from __future__ import print_function - import platform -import simplejson as json +import json import subprocess import os diff --git a/lbrynet/core/utils.py b/lbrynet/core/utils.py index 6abb9f713..72eacee55 100644 --- a/lbrynet/core/utils.py +++ b/lbrynet/core/utils.py @@ -4,7 +4,7 @@ import datetime import random import socket import string -import simplejson as json +import json import traceback import functools import logging diff --git a/lbrynet/daemon/Daemon.py b/lbrynet/daemon/Daemon.py index dfe496f41..b3a0c22f5 100644 --- a/lbrynet/daemon/Daemon.py +++ b/lbrynet/daemon/Daemon.py @@ -3,7 +3,7 @@ import mimetypes import os import requests import urllib -import simplejson as json +import json import textwrap import signal from binascii import hexlify, unhexlify, b2a_hex diff --git a/lbrynet/daemon/DaemonCLI.py b/lbrynet/daemon/DaemonCLI.py index 6ad7405f9..3cecc7c42 100644 --- a/lbrynet/daemon/DaemonCLI.py +++ b/lbrynet/daemon/DaemonCLI.py @@ -1,4 +1,4 @@ -import simplejson as json +import json import os import sys import colorama diff --git a/lbrynet/daemon/ExchangeRateManager.py b/lbrynet/daemon/ExchangeRateManager.py index 0c0b9ab84..acafe77d4 100644 --- a/lbrynet/daemon/ExchangeRateManager.py +++ b/lbrynet/daemon/ExchangeRateManager.py @@ -1,6 +1,6 @@ import time import logging -import simplejson as json +import json import treq from twisted.internet import defer diff --git a/lbrynet/daemon/auth/client.py b/lbrynet/daemon/auth/client.py index 588ec9d56..6c81eb686 100644 --- a/lbrynet/daemon/auth/client.py +++ b/lbrynet/daemon/auth/client.py @@ -1,5 +1,5 @@ import os -import simplejson as json +import json import urlparse import requests from requests.cookies import RequestsCookieJar diff --git a/lbrynet/daemon/auth/server.py b/lbrynet/daemon/auth/server.py index 980af9524..74766e262 100644 --- a/lbrynet/daemon/auth/server.py +++ b/lbrynet/daemon/auth/server.py @@ -1,6 +1,6 @@ import logging from six.moves.urllib import parse as urlparse -import simplejson as json +import json import inspect import signal diff --git a/lbrynet/daemon/auth/util.py b/lbrynet/daemon/auth/util.py index 35ac1e464..3e12d2b51 100644 --- a/lbrynet/daemon/auth/util.py +++ b/lbrynet/daemon/auth/util.py @@ -3,7 +3,7 @@ import hmac import hashlib import yaml import os -import simplejson as json +import json import logging log = logging.getLogger(__name__) diff --git a/lbrynet/database/migrator/migrate5to6.py b/lbrynet/database/migrator/migrate5to6.py index 8ffef1765..82518e81c 100644 --- a/lbrynet/database/migrator/migrate5to6.py +++ b/lbrynet/database/migrator/migrate5to6.py @@ -1,6 +1,6 @@ import sqlite3 import os -import simplejson as json +import json import logging from lbryschema.decode import smart_decode from lbrynet import conf diff --git a/lbrynet/reflector/client/blob.py b/lbrynet/reflector/client/blob.py index 1c2d02dab..d2533cb02 100644 --- a/lbrynet/reflector/client/blob.py +++ b/lbrynet/reflector/client/blob.py @@ -1,4 +1,4 @@ -import simplejson as json +import json import logging from twisted.protocols.basic import FileSender diff --git a/lbrynet/reflector/client/client.py b/lbrynet/reflector/client/client.py index c1fe6f4c9..1dd33144e 100644 --- a/lbrynet/reflector/client/client.py +++ b/lbrynet/reflector/client/client.py @@ -1,4 +1,4 @@ -import simplejson as json +import json import logging from twisted.internet.error import ConnectionRefusedError diff --git a/lbrynet/reflector/server/server.py b/lbrynet/reflector/server/server.py index 21bf5fa53..c2ac4a3b6 100644 --- a/lbrynet/reflector/server/server.py +++ b/lbrynet/reflector/server/server.py @@ -1,5 +1,5 @@ import logging -import simplejson as json +import json from twisted.python import failure from twisted.internet import error, defer from twisted.internet.protocol import Protocol, ServerFactory diff --git a/lbrynet/wallet/manager.py b/lbrynet/wallet/manager.py index e31d63d22..2c2c41a88 100644 --- a/lbrynet/wallet/manager.py +++ b/lbrynet/wallet/manager.py @@ -1,6 +1,6 @@ import os import six -import simplejson as json +import json from binascii import hexlify from twisted.internet import defer diff --git a/scripts/download_blobs_from_reflector.py b/scripts/download_blobs_from_reflector.py index 68d8b05f6..19a0ac219 100644 --- a/scripts/download_blobs_from_reflector.py +++ b/scripts/download_blobs_from_reflector.py @@ -1,7 +1,7 @@ """A test script that downloads blobs from a reflector server""" import argparse import itertools -import simplejson as json +import json import random import subprocess import sys diff --git a/scripts/migrate_lbryum_to_lbrycrd.py b/scripts/migrate_lbryum_to_lbrycrd.py index 69cf03199..fdafacd6e 100644 --- a/scripts/migrate_lbryum_to_lbrycrd.py +++ b/scripts/migrate_lbryum_to_lbrycrd.py @@ -1,6 +1,6 @@ import argparse import hashlib -import simplejson as json +import json import subprocess import sys diff --git a/scripts/reseed_file.py b/scripts/reseed_file.py index 9e21155d3..0068ce5c8 100644 --- a/scripts/reseed_file.py +++ b/scripts/reseed_file.py @@ -7,7 +7,7 @@ the new blobs to the manager. import argparse import binascii import logging -import simplejson as json +import json import os import sys diff --git a/scripts/seed_node.py b/scripts/seed_node.py index 4cbed1a9a..c94d55de0 100644 --- a/scripts/seed_node.py +++ b/scripts/seed_node.py @@ -1,5 +1,5 @@ import struct -import simplejson as json +import json import logging import argparse import hashlib diff --git a/tests/unit/lbrynet_daemon/test_Daemon.py b/tests/unit/lbrynet_daemon/test_Daemon.py index 77b4ed0b7..31bf90407 100644 --- a/tests/unit/lbrynet_daemon/test_Daemon.py +++ b/tests/unit/lbrynet_daemon/test_Daemon.py @@ -1,5 +1,5 @@ import mock -import simplejson as json +import json import random from os import path diff --git a/tests/unit/test_conf.py b/tests/unit/test_conf.py index 2044dd988..4675cc8e7 100644 --- a/tests/unit/test_conf.py +++ b/tests/unit/test_conf.py @@ -1,5 +1,5 @@ import os -import simplejson as json +import json import sys import tempfile from unittest import skipIf