Redo how libraries are imported so they can import each other (should…

… fix the hachoir_metadata import bug)

SickBeard.py

@@ -32,6 +32,9 @@
 import traceback
 import getopt
 
+# allow libraries to import each other
+sys.path.append(os.path.join(os.path.dirname(__file__), 'lib'))
+
 import sickbeard
 
 from sickbeard import db
@@ -95,7 +98,7 @@ def daemonize():
 def main():
 
     # do some preliminary stuff
-    sickbeard.MY_FULLNAME = os.path.normpath(os.path.abspath(sys.argv[0]))
+    sickbeard.MY_FULLNAME = os.path.normpath(os.path.abspath(__file__))
     sickbeard.MY_NAME = os.path.basename(sickbeard.MY_FULLNAME)
     sickbeard.PROG_DIR = os.path.dirname(sickbeard.MY_FULLNAME)
     sickbeard.MY_ARGS = sys.argv[1:]

lib/hachoir_metadata/__init__.py

@@ -1,4 +1,4 @@
-from hachoir_metadata.version import VERSION as __version__
+from .hachoir_metadata.version import VERSION as __version__
 from hachoir_metadata.metadata import extractMetadata
 
 # Just import the module,

lib/oauth2/__init__.py

@@ -28,7 +28,7 @@
 import urlparse
 import hmac
 import binascii
-import lib.httplib2 as httplib2
+import httplib2
 
 try:
     from urlparse import parse_qs, parse_qsl

lib/pythontwitter/__init__.py

@@ -42,7 +42,7 @@
 except ImportError:
   try:
     # Python < 2.6
-    import lib.simplejson as simplejson
+    import simplejson
   except ImportError:
     try:
       # Google App Engine
@@ -61,7 +61,7 @@
 except ImportError:
   from md5 import md5
 
-import lib.oauth2 as oauth
+import oauth2 as oauth
 
 
 CHARACTER_LIMIT = 140

lib/simplejson/decoder.py

@@ -4,9 +4,9 @@
 import sys
 import struct
 
-from lib.simplejson.scanner import make_scanner
+from simplejson.scanner import make_scanner
 try:
-    from lib.simplejson._speedups import scanstring as c_scanstring
+    from simplejson._speedups import scanstring as c_scanstring
 except ImportError:
     c_scanstring = None
 

lib/simplejson/encoder.py

@@ -3,11 +3,11 @@
 import re
 
 try:
-    from lib.simplejson._speedups import encode_basestring_ascii as c_encode_basestring_ascii
+    from simplejson._speedups import encode_basestring_ascii as c_encode_basestring_ascii
 except ImportError:
     c_encode_basestring_ascii = None
 try:
-    from lib.simplejson._speedups import make_encoder as c_make_encoder
+    from simplejson._speedups import make_encoder as c_make_encoder
 except ImportError:
     c_make_encoder = None
 

lib/tvdb_api/tvdb_api.py

@@ -41,10 +41,7 @@
 
 
 # Use local version for sickbeard, system version elsewhere
-try:
-    import lib.httplib2 as httplib2
-except ImportError:
-    import httplib2 as httplib2
+import httplib2
 
 from tvdb_ui import BaseUI, ConsoleUI
 from tvdb_exceptions import (tvdb_error, tvdb_userabort, tvdb_shownotfound,

sickbeard/image_cache.py

@@ -24,9 +24,6 @@
 from sickbeard import helpers, logger, exceptions
 from sickbeard import encodingKludge as ek
 
-# this is such a hack, I really need to fix this crap
-sys.path.append(os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])), 'lib'))
-
 from sickbeard.metadata.generic import GenericMetadata
 
 from lib.hachoir_parser import createParser