Merge branch 'master' of github.com:rocky/python2-trepan

Author: rocky

README.rst

@@ -243,8 +243,6 @@ See Also
 .. |TravisCI| image:: https://api.travis-ci.org/rocky/python2-trepan.svg
     :target: https://travis-ci.org/rocky/python2-trepan
     :alt: Travis Build status
-.. |CircleCI| image::https://circleci.com/gh/rocky/python2-trepan.svg?style=svg
-    :target: https://circleci.com/gh/rocky/python2-trepan
 .. _ipython-trepan: https://github.com/rocky/ipython-trepan
 .. |license| image:: https://img.shields.io/pypi/l/trepan2.svg
    :target: https://pypi.python.org/pypi/trepan2

trepan/Makefile

@@ -61,7 +61,7 @@ def run(self, args):
 
         try:
             opts, args = getopt(args, "hl", ["help", "list"],)
-        except GetoptError as err:
+        except GetoptError(err):
             # print help information and exit:
             self.errmsg(
                 str(err)