Merge lp:~patrickas/ensoft-sextant/python3 into lp:ensoft-sextant

[Patrick Stevens]

Make Sextant Web fail gracefully if we attempt to run it under Python 3.

Make Sextant Web fail gracefully if we attempt to run it under Python 3. Now all of Sextant runs under Python 3 without causing any Python 2-related errors.

[lp:~patrickas/ensoft-sextant/python3]

5. By Patrick Stevens <email address hidden> on 2014-08-18

Use logging instead of print for errors

6. By Patrick Stevens <email address hidden> on 2014-08-19

Merge minor bugfixes branch

[Patrick Stevens (patrickas)]

review: Approve

=== modified file 'src/sextant/__main__.py'
--- src/sextant/__main__.py	2014-08-15 10:49:08 +0000
+++ src/sextant/__main__.py	2014-08-19 09:13:40 +0000
@@ -153,7 +153,12 @@
 def _start_web(args):
     # Don't import at top level -- this makes twisted dependency semi-optional,
     # allowing non-web functionality to work with Python 3.
-    from .web import server
+    try:
+        from .web import server
+    except ImportError as e:  # twisted wasn't available - Python 2
+        log.error('Web server must be run on Python 2.')
+        log.error(e)
+        return 
     log.info("Serving site on port %s", args.port)
     server.serve_site(input_database_url=args.remote_neo4j, port=args.port)
 
 
=== modified file 'src/sextant/query.py'
--- src/sextant/query.py	2014-08-11 15:14:05 +0000
+++ src/sextant/query.py	2014-08-19 09:13:40 +0000
@@ -18,8 +18,8 @@
     try:
         db = db_api.SextantConnection(remote_neo4j)
     except requests.exceptions.ConnectionError as err:
-        logging.exception("Could not connect to Neo4J server {}. Are you sure it is running?".format(remote_neo4j))
-        logging.exception(str(err))
+        logging.error("Could not connect to Neo4J server {}. Are you sure it is running?".format(remote_neo4j))
+        logging.error(str(err))
         return 2
     #Not supported in python 2
     #except (urllib.exceptions.MaxRetryError):