From cf4cbd9a34f5cefbb90ff0f8d863cb0c7e19414d Mon Sep 17 00:00:00 2001 From: echel0n Date: Wed, 18 Jun 2014 01:53:11 -0700 Subject: [PATCH] Fix for missing WITH statement --- SickBeard.py | 2 ++ sickbeard/webserveInit.py | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/SickBeard.py b/SickBeard.py index 79267797..9c182bef 100755 --- a/SickBeard.py +++ b/SickBeard.py @@ -18,6 +18,8 @@ # along with SickRage. If not, see . # Check needed software dependencies to nudge users to fix their setup +from __future__ import with_statement + import sys if sys.version_info < (2, 6): diff --git a/sickbeard/webserveInit.py b/sickbeard/webserveInit.py index f333d845..1f90ecb5 100644 --- a/sickbeard/webserveInit.py +++ b/sickbeard/webserveInit.py @@ -114,6 +114,8 @@ def initWebServer(options={}): app.add_handlers(".*$", [ (r'%s/(favicon\.ico)' % options['web_root'], MultiStaticFileHandler, {'paths': [os.path.join(options['data_root'], 'images/ico/favicon.ico')]}), + (r'%s/(.*)(/?)' % options['web_root'], MultiStaticFileHandler, + {'paths': [options['data_root']]}), (r'%s/%s/(.*)(/?)' % (options['web_root'], 'images'), MultiStaticFileHandler, {'paths': [os.path.join(options['data_root'], 'images'), os.path.join(sickbeard.CACHE_DIR, 'images'), @@ -121,7 +123,9 @@ def initWebServer(options={}): (r'%s/%s/(.*)(/?)' % (options['web_root'], 'css'), MultiStaticFileHandler, {'paths': [os.path.join(options['data_root'], 'css')]}), (r'%s/%s/(.*)(/?)' % (options['web_root'], 'js'), MultiStaticFileHandler, - {'paths': [os.path.join(options['data_root'], 'js')]}) + {'paths': [os.path.join(options['data_root'], 'js'), + os.path.join(options['data_root'], 'js/lib'), + os.path.join(options['data_root'], 'js/fancybox')]}) ])