From 3cb19d4856dd84da3eeb8806b367e22a8ab4a40f Mon Sep 17 00:00:00 2001 From: Easton Adams Date: Fri, 13 Mar 2015 15:17:51 +0800 Subject: [PATCH] fixed two errors: 1: in bundle_local.py, the logic when checking if a line is empty or comment is wrong 2: in dev_server.py, when loading index.wsgi and importing its reference files, if IOError occurs, it will tell "Seems you don't have an index.wsgi" even when index.wsgi does exists, that's not rational. --- dev_server/bundle_local.py | 4 ++-- dev_server/dev_server.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dev_server/bundle_local.py b/dev_server/bundle_local.py index d5f1d5d..21a7b04 100755 --- a/dev_server/bundle_local.py +++ b/dev_server/bundle_local.py @@ -45,8 +45,8 @@ def main(): # Get the dists in requirements.txt dists = [] for line in open(options.requirements, 'r').readlines(): - if line.strip() or line.startswith('#'): - pass + if line.strip() == '' or line.startswith('#'): + continue pkg = line.split('==')[0] if pkg not in installed_dists: diff --git a/dev_server/dev_server.py b/dev_server/dev_server.py index 895537b..1803f54 100755 --- a/dev_server/dev_server.py +++ b/dev_server/dev_server.py @@ -16,6 +16,7 @@ from sae.util import search_file_bottom_up from sae.channel import _channel_wrapper +import traceback app_root = search_file_bottom_up('config.yaml') if app_root is None: @@ -173,8 +174,8 @@ def main(options): try: index = imp.load_source('index', 'index.wsgi') - except IOError: - print >>sys.stderr, "Seems you don't have an index.wsgi" + except: + print >>sys.stderr, traceback.format_exc() return if not hasattr(index, 'application'): print >>sys.stderr, "application not found in index.wsgi"