Merge pull request #218 from mhearne-usgs/v20

Added DOI for software release.

README.md

@@ -76,3 +76,9 @@ Example Jupyter notebooks show how the API can be used to get and manipulate inf
 - [Magnitude Comparison Notebook](https://github.com/usgs/libcomcat/blob/master/notebooks/ComparingMagnitudes.ipynb)
 - [Phase and Magnitude Notebook](https://github.com/usgs/libcomcat/blob/master/notebooks/PhasesAndMagnitudes.ipynb)
 - [Search Notebook](https://github.com/usgs/libcomcat/blob/master/notebooks/Search.ipynb)
+
+## Citation
+
+If you wish to cite this work in your own publication, you may use this DOI:
+https://doi.org/10.5066/P91WN1UQ
+

libcomcat/bin/geteventhist.py

@@ -120,7 +120,7 @@ def get_parser():
     # optional arguments
     ohelp = '''Directory where files are stored.'''
     parser.add_argument('-d', '--outdir', help=ohelp,
-                        default=None)
+                        default=os.path.expanduser('~'))
     parser.add_argument('--exclude-products',
                         help='COMCAT products to be excluded from the spreadsheet.',
                         nargs='*', default=[])
@@ -341,13 +341,16 @@ def main():
 
     # web output and directory output are mutually exclusive
     if args.outdir and args.web:
-        msg = '''The -d and --web options are mutually exclusive, meaning
-        that you cannot choose to write files to a directory and print
-        HTML output to the screen simultaneously. Please choose one of
-        those two options and try again.
-        '''
-        print(msg)
-        sys.exit(1)
+        if args.outdir != os.path.expanduser('~'):
+            msg = '''The -d and --web options are mutually exclusive, meaning
+            that you cannot choose to write files to a directory and print
+            HTML output to the screen simultaneously. Please choose one of
+            those two options and try again.
+            '''
+            print(msg)
+            sys.exit(1)
+        else:
+            args.outdir = None
     if args.radius and not args.window:
         msg = '''To define a time and distance range, the radius and window
          options must both be set.

libcomcat/classes.py

@@ -367,7 +367,7 @@ def __init__(self, url):
             response = requests.get(url, timeout=TIMEOUT, headers=HEADERS)
             self._jdict = response.json()
             self._actual_url = url
-        except HTTPError:
+        except requests.exceptions.ReadTimeout as rt:
             try:
                 response = requests.get(url, timeout=TIMEOUT, headers=HEADERS)
                 self._jdict = response.json()
@@ -909,6 +909,8 @@ def getContentURL(self, regexp):
         content_name = 'a' * 1000
         found = False
         content_url = ''
+        if 'contents' not in self._product:
+            return None
         if not len(self._product['contents']):
             return None
         for contentkey, content in self._product['contents'].items():