Merge pull request #382 from adam111316/feature/FixLibraryImports

Fix to correctly load local libraries instead of system installed lib…

CHANGES.md

@@ -18,6 +18,7 @@
 * Fix getManualSearchStatus: object has no attribute 'segment'
 * Change handling of general HTTP error response codes to prevent issues
 * Add handling for CloudFlare custom HTTP response codes
+* Fix to correctly load local libraries instead of system installed libraries
 
 [develop changelog]
 * Update Requests library 2.7.0 (ab1f493) to 2.7.0 (8b5e457)

SickBeard.py

@@ -47,7 +47,7 @@ except:
     print 'The Python module Cheetah is required'
     sys.exit(1)
 
-sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), 'lib')))
+sys.path.insert(1, os.path.abspath(os.path.join(os.path.dirname(__file__), 'lib')))
 
 # We only need this for compiling an EXE and I will just always do that on 2.6+
 if sys.hexversion >= 0x020600F0:

autoProcessTV/autoProcessTV.py

@@ -24,8 +24,8 @@ import os.path
 import sys
 
 sickbeardPath = os.path.split(os.path.split(sys.argv[0])[0])[0]
-sys.path.append(os.path.join(sickbeardPath, 'lib'))
-sys.path.append(sickbeardPath)
+sys.path.insert(1, os.path.join(sickbeardPath, 'lib'))
+sys.path.insert(1, sickbeardPath)
 
 try:
     import requests

autoProcessTV/mediaToSickbeard.py

@@ -6,8 +6,8 @@ import ConfigParser
 import logging
 
 sickbeardPath = os.path.split(os.path.split(sys.argv[0])[0])[0]
-sys.path.append(os.path.join(sickbeardPath, 'lib'))
-sys.path.append(sickbeardPath)
+sys.path.insert(1, os.path.join(sickbeardPath, 'lib'))
+sys.path.insert(1, sickbeardPath)
 configFilename = os.path.join(sickbeardPath, 'config.ini')
 
 try:

lib/tvdb_api/tests/test_tvdb_api.py

@@ -17,7 +17,7 @@ import unittest
 # Force parent directory onto path
 #sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-sys.path.append(os.path.abspath('../../tests'))
+sys.path.insert(1, os.path.abspath('../../tests'))
 
 
 import sickbeard

sickbeard/__init__.py

@@ -32,7 +32,7 @@ import os.path
 import uuid
 import base64
 import sickbeard
-sys.path.append(os.path.abspath('../lib'))
+sys.path.insert(1, os.path.abspath('../lib'))
 from sickbeard import providers, metadata, config, webserveInit
 from sickbeard.providers.generic import GenericProvider
 from providers import btn, newznab, womble, thepiratebay, torrentleech, kat, iptorrents, \

tests/common_tests.py

@@ -2,7 +2,7 @@ import unittest
 
 import sys
 import os.path
-sys.path.append(os.path.abspath('..'))
+sys.path.insert(1, os.path.abspath('..'))
 
 from sickbeard import common
 

tests/helpers_tests.py

@@ -5,7 +5,7 @@ import os.path
 from sickbeard import helpers
 
 
-sys.path.append(os.path.abspath('..'))
+sys.path.insert(1, os.path.abspath('..'))
 
 
 class HelpersTests(unittest.TestCase):

tests/migration_tests.py

@@ -7,8 +7,8 @@ import sickbeard
 from time import sleep
 from sickbeard import db
 
-sys.path.append(os.path.abspath('..'))
-sys.path.append(os.path.abspath('../lib'))
+sys.path.insert(1, os.path.abspath('..'))
+sys.path.insert(1, os.path.abspath('../lib'))
 
 sickbeard.SYS_ENCODING = 'UTF-8'
 

tests/name_parser_tests.py

@@ -4,8 +4,8 @@ import test_lib as test
 
 import sys, os.path
 
-sys.path.append(os.path.abspath('..'))
-sys.path.append(os.path.abspath('../lib'))
+sys.path.insert(1, os.path.abspath('..'))
+sys.path.insert(1, os.path.abspath('../lib'))
 
 from sickbeard.name_parser import parser
 

tests/scene_helpers_tests.py

@@ -2,7 +2,7 @@ import unittest
 import test_lib as test
 
 import sys, os.path
-sys.path.append(os.path.abspath('..'))
+sys.path.insert(1, os.path.abspath('..'))
 
 from sickbeard import show_name_helpers, scene_exceptions, common, name_cache
 

tests/test_lib.py

@@ -25,8 +25,8 @@ import glob
 import sys
 import os.path
 
-sys.path.append(os.path.abspath('..'))
-sys.path.append(os.path.abspath('../lib'))
+sys.path.insert(1, os.path.abspath('..'))
+sys.path.insert(1, os.path.abspath('../lib'))
 
 import sickbeard
 import shutil

tests/torrent_tests.py

@@ -23,8 +23,8 @@ import unittest
 import sys, os.path
 import urlparse
 
-sys.path.append(os.path.abspath('..'))
-sys.path.append(os.path.abspath('../lib'))
+sys.path.insert(1, os.path.abspath('..'))
+sys.path.insert(1, os.path.abspath('../lib'))
 
 import test_lib as test
 from bs4 import BeautifulSoup

tests/xem_tests.py

@@ -24,8 +24,8 @@ import sys, os.path
 import datetime
 import re
 
-sys.path.append(os.path.abspath('..'))
-sys.path.append(os.path.abspath('../lib'))
+sys.path.insert(1, os.path.abspath('..'))
+sys.path.insert(1, os.path.abspath('../lib'))
 
 import test_lib as test
 import sickbeard