Remove simplejson

sickbeard/notifiers/emby.py

@@ -18,6 +18,8 @@
 # You should have received a copy of the GNU General Public License
 # along with Medusa. If not, see <http://www.gnu.org/licenses/>.
 
+import json
+
 from requests.compat import urlencode
 from six.moves.urllib.request import urlopen, Request
 from six.moves.urllib.error import URLError
@@ -27,11 +29,6 @@
 from sickbeard import logger
 from sickrage.helper.exceptions import ex
 
-try:
-    import json
-except ImportError:
-    import simplejson as json
-
 
 class Notifier(object):
 

sickbeard/notifiers/kodi.py

@@ -20,6 +20,7 @@
 
 import socket
 import base64
+import json
 import time
 
 from requests.compat import urlencode, unquote, unquote_plus, quote
@@ -37,12 +38,6 @@
 except ImportError:
     import xml.etree.ElementTree as etree
 
-try:
-    import json
-except ImportError:
-    import simplejson as json
-
-
 class Notifier(object):
     def _get_kodi_version(self, host, username, password, dest_app="KODI"):
         """Returns KODI JSON-RPC API version (odd # = dev, even # = stable)

sickbeard/providers/hdbits.py

@@ -18,18 +18,15 @@
 # along with SickRage. If not, see <http://www.gnu.org/licenses/>.
 
 import datetime
+import json
+
 from requests.compat import urlencode, urljoin
 
 from sickbeard import classes, logger, tvcache
 
 from sickrage.helper.exceptions import AuthException
 from sickrage.providers.torrent.TorrentProvider import TorrentProvider
 
-try:
-    import json
-except ImportError:
-    import simplejson as json
-
 
 class HDBitsProvider(TorrentProvider):
 

sickbeard/providers/norbits.py

@@ -19,6 +19,9 @@
 # along with SickRage. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import unicode_literals
+
+import json
+
 from requests.compat import urlencode
 
 from sickbeard import logger, tvcache
@@ -27,11 +30,6 @@
 from sickrage.helper.common import convert_size, try_int
 from sickrage.providers.torrent.TorrentProvider import TorrentProvider
 
-try:
-    import json
-except ImportError:
-    import simplejson as json
-
 
 class NorbitsProvider(TorrentProvider):  # pylint: disable=too-many-instance-attributes
     """Main provider object"""

sickbeard/webapi.py

@@ -25,6 +25,7 @@
 
 from datetime import datetime, date
 import io
+import json
 import os
 import re
 import time
@@ -67,13 +68,6 @@
 from sickrage.system.Restart import Restart
 from sickrage.system.Shutdown import Shutdown
 
-# Conditional imports
-try:
-    import json
-except ImportError:
-    # pylint: disable=import-error
-    import simplejson as json
-
 
 indexer_ids = ["indexerid", "tvdbid"]
 

sickbeard/webserve.py

@@ -23,6 +23,7 @@
 import ast
 import datetime
 import io
+import json
 import os
 import re
 import traceback
@@ -103,13 +104,6 @@
 from sickbeard.classes import SearchResult
 
 
-# Conditional imports
-try:
-    import json
-except ImportError:
-    import simplejson as json
-
-
 mako_lookup = None
 mako_cache = None
 mako_path = None