Using simplejson and fixed some encodes and decodes

build/upload_assets.py

@@ -1,5 +1,5 @@
 import glob
-import json
+import simplejson as json
 import os
 import subprocess
 import sys

lbrynet/conf.py

@@ -1,5 +1,5 @@
 import base58
-import json
+import simplejson as json
 import logging
 import os
 import re

lbrynet/core/StreamDescriptor.py

@@ -1,6 +1,6 @@
 import binascii
 from collections import defaultdict
-import json
+import simplejson as json
 import logging
 
 from twisted.internet import threads, defer

lbrynet/core/client/ClientProtocol.py

@@ -1,4 +1,4 @@
-import json
+import simplejson as json
 import logging
 from decimal import Decimal
 from twisted.internet import error, defer

lbrynet/core/server/ServerRequestHandler.py

@@ -1,4 +1,4 @@
-import json
+import simplejson as json
 import logging
 from twisted.internet import defer
 

lbrynet/core/system_info.py

@@ -1,7 +1,7 @@
 from __future__ import print_function
 
 import platform
-import json
+import simplejson as json
 import subprocess
 import os
 

lbrynet/core/utils.py

@@ -4,7 +4,7 @@ import datetime
 import random
 import socket
 import string
-import json
+import simplejson as json
 import traceback
 import functools
 import logging

lbrynet/daemon/Daemon.py

@@ -3,7 +3,7 @@ import mimetypes
 import os
 import requests
 import urllib
-import json
+import simplejson as json
 import textwrap
 import signal
 from binascii import hexlify, unhexlify, b2a_hex

lbrynet/daemon/DaemonCLI.py

@@ -1,4 +1,4 @@
-import json
+import simplejson as json
 import os
 import sys
 import colorama

lbrynet/daemon/ExchangeRateManager.py

@@ -1,6 +1,6 @@
 import time
 import logging
-import json
+import simplejson as json
 
 import treq
 from twisted.internet import defer

lbrynet/daemon/auth/client.py

@@ -1,5 +1,5 @@
 import os
-import json
+import simplejson as json
 import urlparse
 import requests
 from requests.cookies import RequestsCookieJar

lbrynet/daemon/auth/server.py

@@ -1,6 +1,6 @@
 import logging
 from six.moves.urllib import parse as urlparse
-import json
+import simplejson as json
 import inspect
 import signal
 

lbrynet/daemon/auth/util.py

@@ -3,7 +3,7 @@ import hmac
 import hashlib
 import yaml
 import os
-import json
+import simplejson as json
 import logging
 
 log = logging.getLogger(__name__)

lbrynet/database/migrator/migrate5to6.py

@@ -1,6 +1,6 @@
 import sqlite3
 import os
-import json
+import simplejson as json
 import logging
 from lbryschema.decode import smart_decode
 from lbrynet import conf

lbrynet/database/storage.py

@@ -268,7 +268,7 @@ class SQLiteStorage(WalletDatabase):
         blob_hashes = yield self.run_and_return_list(
             "select blob_hash from blob where status='finished'"
         )
-        defer.returnValue([blob_hash.decode('hex') for blob_hash in blob_hashes])
+        defer.returnValue([bytes.fromhex(blob_hash).decode('latin-1') for blob_hash in blob_hashes])
 
     def count_finished_blobs(self):
         return self.run_and_return_one_or_none(
@@ -492,7 +492,8 @@ class SQLiteStorage(WalletDatabase):
     @defer.inlineCallbacks
     def save_downloaded_file(self, stream_hash, file_name, download_directory, data_payment_rate):
         # touch the closest available file to the file name
-        file_name = yield open_file_for_writing(download_directory.decode('hex'), file_name.decode('hex'))
+        file_name = yield open_file_for_writing(bytes.fromhex(download_directory).decode(),
+                                                bytes.fromhex(file_name).decode())
         result = yield self.save_published_file(
             stream_hash, file_name.encode('hex'), download_directory, data_payment_rate
         )

lbrynet/lbry_file/client/EncryptedFileDownloader.py

@@ -181,7 +181,7 @@ class EncryptedFileSaver(EncryptedFileDownloader):
 class EncryptedFileSaverFactory(EncryptedFileDownloaderFactory):
     def __init__(self, peer_finder, rate_limiter, blob_manager, storage, wallet, download_directory):
         EncryptedFileDownloaderFactory.__init__(self, peer_finder, rate_limiter, blob_manager, storage, wallet)
-        self.download_directory = binascii.hexlify(download_directory)
+        self.download_directory = binascii.hexlify(download_directory.encode())
 
     def _make_downloader(self, stream_hash, payment_rate_manager, stream_info):
         stream_name = stream_info.raw_info['stream_name']

lbrynet/reflector/client/blob.py

@@ -1,4 +1,4 @@
-import json
+import simplejson as json
 import logging
 
 from twisted.protocols.basic import FileSender

lbrynet/reflector/client/client.py

@@ -1,4 +1,4 @@
-import json
+import simplejson as json
 import logging
 
 from twisted.internet.error import ConnectionRefusedError

lbrynet/reflector/server/server.py

@@ -1,5 +1,5 @@
 import logging
-import json
+import simplejson as json
 from twisted.python import failure
 from twisted.internet import error, defer
 from twisted.internet.protocol import Protocol, ServerFactory

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 json
+import simplejson as json
 import random
 import subprocess
 import sys

scripts/migrate_lbryum_to_lbrycrd.py

@@ -1,6 +1,6 @@
 import argparse
 import hashlib
-import json
+import simplejson as json
 import subprocess
 import sys
 

scripts/reseed_file.py

@@ -7,7 +7,7 @@ the new blobs to the manager.
 import argparse
 import binascii
 import logging
-import json
+import simplejson as json
 import os
 import sys
 

scripts/seed_node.py

@@ -1,5 +1,5 @@
 import struct
-import json
+import simplejson as json
 import logging
 import argparse
 import hashlib

setup.py

@@ -35,7 +35,8 @@ requires = [
     'colorama==0.3.7',
     'six',
     'pyopenssl',
-    'service-identity'
+    'service-identity',
+    'simplejson'
 ]
 
 console_scripts = [

tests/unit/lbrynet_daemon/test_Daemon.py

@@ -1,5 +1,5 @@
 import mock
-import json
+import simplejson as json
 import random
 from os import path
 

tests/unit/test_conf.py

@@ -1,5 +1,5 @@
 import os
-import json
+import simplejson as json
 import sys
 import tempfile
 from unittest import skipIf