diff --git a/arborist/__init__.py b/arborist/__init__.py index 4a2a6f7..1ccdc07 100755 --- a/arborist/__init__.py +++ b/arborist/__init__.py @@ -52,20 +52,15 @@ def add_slash_if_not_windows(url_path): if sys.platform != 'win32': url_path = '/' + url_path - print "not windows: "+url_path - else: - print "windows: "+url_path return url_path class FolderPathConverter(BaseConverter): def __init__(self, url_map): - print "init!" super(FolderPathConverter, self).__init__(url_map) self.regex = '.*' def to_python(self, value): - print "FolderPathConverter: "+value return add_slash_if_not_windows(value) def to_url(self, value): @@ -219,7 +214,8 @@ def create_mapping_file(studiesfolder, study): return json.jsonify(mappingfilename=mappingfilename) -@app.route('/folder//s//params//create/') +@app.route(('/folder//s//params//' + 'create/')) def create_params(studiesfolder, study, datatype): feedback = get_feedback_dict() paramsfile = os.path.join(studiesfolder, study, datatype+'.params') @@ -370,7 +366,8 @@ def add_datafile(studiesfolder, study): study=study)) -@app.route('/folder//s//tree/save_columnsfile/', +@app.route(('/folder//s//tree/' + 'save_columnsfile/'), methods=['POST']) def save_columnsfile(studiesfolder, study): feedback = get_feedback_dict() diff --git a/arborist/functions/highdim.py b/arborist/functions/highdim.py index e436bbb..1cb0dcb 100644 --- a/arborist/functions/highdim.py +++ b/arborist/functions/highdim.py @@ -46,7 +46,6 @@ def subject_sample_to_tree(filename, tree_array): exists = False for item in tree_array: if item['id'] == id: - print item['id'] exists = True break @@ -74,7 +73,6 @@ def subject_sample_to_tree(filename, tree_array): exists = False for item in tree_array: if item['id'] == id: - print item['id'] exists = True break