use six.moves to work around urllib / urllib2 / urlparse to urllib 2to3 cleanup

[htsworkflow.git] / encode_submission / encode3.py

diff --git a/encode_submission/encode3.py b/encode_submission/encode3.py
index cb4bbce36ba63b42bb7f3117efac6bf4b1a976de..82e0401215e5fc3bb85cf25ee8b3b9a5159c9999 100644 (file)
--- a/encode_submission/encode3.py
+++ b/encode_submission/encode3.py
@@ -1,7 +1,8 @@
+#!/usr/bin/env python
 """Create a track hub
 """
+from __future__ import print_function, unicode_literals
 
-#!/usr/bin/env python
 from ConfigParser import SafeConfigParser
 import fnmatch
 from glob import glob
@@ -12,21 +13,15 @@ from optparse import OptionParser, OptionGroup
 import os
 from pprint import pprint, pformat
 import shlex
-from StringIO import StringIO
+from six.moves import StringIO
 import stat
 import sys
 import time
 import types
-import urllib
-import urllib2
-import urlparse
 from zipfile import ZipFile
 
 import RDF
 
-if not 'DJANGO_SETTINGS_MODULE' in os.environ:
-    os.environ['DJANGO_SETTINGS_MODULE'] = 'htsworkflow.settings'
-
 from htsworkflow.util import api
 from htsworkflow.util.rdfhelp import \
     dafTermOntology, \
@@ -46,20 +41,21 @@ logger = logging.getLogger(__name__)
 
 INDENTED = "  " + os.linesep
 
+import django
+if not 'DJANGO_SETTINGS_MODULE' in os.environ:
+    os.environ['DJANGO_SETTINGS_MODULE'] = 'htsworkflow.settings.local'
 
 def main(cmdline=None):
     parser = make_parser()
     opts, args = parser.parse_args(cmdline)
     submission_uri = None
 
+    from django.conf import settings
+
     if opts.debug:
-        logging.basicConfig(level=logging.DEBUG)
+        settings.LOGGING['loggers']['level'] = 'DEBUG'
     elif opts.verbose:
-        logging.basicConfig(level=logging.INFO)
-    else:
-        logging.basicConfig(level=logging.WARNING)
-
-    apidata = api.make_auth_from_opts(opts, parser)
+        settings.LOGGING['loggers']['level'] = 'INFO'
 
     model = get_model(opts.model, opts.db_path)
 
@@ -138,7 +134,7 @@ def main(cmdline=None):
 
     if opts.print_rdf:
         writer = get_serializer()
-        print writer.serialize_model_to_string(model)
+        print(writer.serialize_model_to_string(model))
 
 
 def make_manifest(mapper, results, filename=None):
@@ -207,4 +203,6 @@ def make_parser():
     return parser
 
 if __name__ == "__main__":
+    django.setup()
+
     main()