From 4e7710797a813e4558218da48308cfd2f0c4724c Mon Sep 17 00:00:00 2001
From: echel0n <justin.tabish@gmail.com>
Date: Sat, 26 Apr 2014 00:56:24 -0700
Subject: [PATCH] Fixed mediaToSickBeard issues

---
 autoProcessTV/mediaToSickbeard.py | 9 ++-------
 sickbeard/exceptions.py           | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/autoProcessTV/mediaToSickbeard.py b/autoProcessTV/mediaToSickbeard.py
index 305daf1a..12ee3e69 100644
--- a/autoProcessTV/mediaToSickbeard.py
+++ b/autoProcessTV/mediaToSickbeard.py
@@ -1,14 +1,10 @@
 #!/usr/bin/env python2
-
 import sys
 import os
 import time
 import ConfigParser
 import logging
 
-#Needed for importing logging & requests module
-from sickbeard.exceptions import ex
-
 sickbeardPath = os.path.split(os.path.split(sys.argv[0])[0])[0]
 sys.path.append(os.path.join( sickbeardPath, 'lib'))
 sys.path.append(sickbeardPath)
@@ -37,6 +33,7 @@ logdirsetting = config.get("General", "log_dir") if config.get("General", "log_d
 logdir = os.path.normpath(os.path.join(sickbeardPath, logdirsetting))
 logfile = os.path.join(logdir, 'sickbeard.log')
 
+
 try:
     handler = logging.FileHandler(logfile)
 except:
@@ -48,7 +45,6 @@ handler.setFormatter(formatter)
 scriptlogger.addHandler(handler)
 scriptlogger.setLevel(logging.DEBUG)
 
-
 def utorrent():
 #    print 'Calling utorrent'
     if len(sys.argv) < 2:
@@ -128,7 +124,6 @@ def blackhole():
 #    return (dirName, nzbName)    
 
 def main():
-
     scriptlogger.info(u'Starting external PostProcess script ' + __file__)
 
     host = config.get("General", "web_host")
@@ -202,7 +197,7 @@ def main():
     try:
         response = requests.get(url, auth=(username, password), params=params, verify=False)
     except Exception, e:
-        scriptlogger.error(u': Unknown exception raised when opening url: ' + ex(e))
+        scriptlogger.error(u': Unknown exception raised when opening url: ' + str(e))
         time.sleep(3)
         sys.exit()
     
diff --git a/sickbeard/exceptions.py b/sickbeard/exceptions.py
index 0e8de132..be7afac3 100644
--- a/sickbeard/exceptions.py
+++ b/sickbeard/exceptions.py
@@ -18,7 +18,6 @@
 
 from sickbeard.encodingKludge import fixStupidEncodings
 
-
 def ex(e):
     """
     Returns a unicode string from the exception text if it exists.