X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=blobdiff_plain;f=encode_submission%2Fucsc_gather.py;h=695541aeb713252cd37345e5475739516a0f4dac;hp=a9fa72a83ddc1c4263e509070f50053d238fa405;hb=refs%2Fheads%2Fpython3-django1.5;hpb=4262586d10cc0cc227390873b301b55244204c11 diff --git a/encode_submission/ucsc_gather.py b/encode_submission/ucsc_gather.py index a9fa72a..695541a 100644 --- a/encode_submission/ucsc_gather.py +++ b/encode_submission/ucsc_gather.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from ConfigParser import SafeConfigParser +from configparser import SafeConfigParser import fnmatch from glob import glob import json @@ -9,14 +9,14 @@ from optparse import OptionParser, OptionGroup import os from pprint import pprint, pformat import shlex -from StringIO import StringIO +from io import StringIO import stat import sys import time import types -import urllib -import urllib2 -import urlparse +import urllib.request, urllib.parse, urllib.error +import urllib.request, urllib.error, urllib.parse +import urllib.parse from zipfile import ZipFile import RDF @@ -119,7 +119,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_parser(): @@ -177,7 +177,7 @@ def make_parser(): def make_all_ddfs(view_map, library_result_map, daf_name, make_condor=True, force=False): dag_fragment = [] - for lib_id, result_dir in library_result_map.items(): + for lib_id, result_dir in list(library_result_map.items()): submissionNode = view_map.get_submission_node(result_dir) dag_fragment.extend( make_ddf(view_map, submissionNode, daf_name, make_condor, result_dir) @@ -268,7 +268,7 @@ ORDER BY ?submitView""" else: current[variable_name] = value - for view in all_views.keys(): + for view in list(all_views.keys()): line = [] for variable_name in variables: if variable_name in ('files', 'md5sum'):