From: Diane Trout <diane@ghic.org>
Date: Thu, 29 Jan 2015 19:00:47 +0000 (-0800)
Subject: remove ,'s from more except blocks, and now a raise too
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=e57e704c4daf0db551090cb40b2668a1628d1e65

remove ,'s from more except blocks, and now a raise too
---

diff --git a/experiments/test_experiments.py b/experiments/test_experiments.py
index 5a39d44..7c5d201 100644
--- a/experiments/test_experiments.py
+++ b/experiments/test_experiments.py
@@ -4,7 +4,7 @@ import re
 from lxml.html import fromstring
 try:
     import json
-except ImportError, e:
+except ImportError as e:
     import simplejson as json
 import os
 import shutil
diff --git a/htsworkflow/pipelines/genome_mapper.py b/htsworkflow/pipelines/genome_mapper.py
index 35830a2..83bdecb 100644
--- a/htsworkflow/pipelines/genome_mapper.py
+++ b/htsworkflow/pipelines/genome_mapper.py
@@ -30,7 +30,7 @@ def getAvailableGenomes(genome_base_dir):
   # Need valid directory
   if not os.path.exists(genome_base_dir):
     msg = "Directory does not exist: %s" % (genome_base_dir)
-    raise IOError, msg
+    raise IOError(msg)
 
   # Find all subdirectories
   filepath_list = glob.glob(os.path.join(genome_base_dir, '*'))
diff --git a/htsworkflow/pipelines/retrieve_config.py b/htsworkflow/pipelines/retrieve_config.py
index 1d44214..3fdd8bf 100644
--- a/htsworkflow/pipelines/retrieve_config.py
+++ b/htsworkflow/pipelines/retrieve_config.py
@@ -12,7 +12,7 @@ import urllib2
 
 try:
     import json
-except ImportError, e:
+except ImportError as e:
     import simplejson as json
 
 from htsworkflow.auth import apidata