From: Diane Trout <diane@ghic.org>
Date: Fri, 27 Mar 2015 18:13:50 +0000 (-0700)
Subject: Merge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=278c6567bfd3fb276b8bcbe0a922fb1895cb163e

Merge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7
---

278c6567bfd3fb276b8bcbe0a922fb1895cb163e
diff --cc encode_submission/encode3.py
index 82e0401,a3f6d29..1e1a54a
--- a/encode_submission/encode3.py
+++ b/encode_submission/encode3.py
@@@ -134,19 -123,9 +121,9 @@@ 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):
-     manifest = mapper.make_manifest(results)
- 
-     if filename is None or filename == '-':
-         sys.stdout.write(manifest)
-     else:
-         with open(filename, 'w') as mainifeststream:
-             mainifeststream.write(manifest)
- 
- 
  def make_parser():
      parser = OptionParser()