diff --git a/tc-copy b/tc-copy index 4c77b76cb..a1a293e57 100755 --- a/tc-copy +++ b/tc-copy @@ -1,6 +1,5 @@ #!/usr/bin/env python -from itertools import imap import logging from optparse import OptionParser import os.path @@ -86,39 +85,39 @@ def main(argv): if not options.overwrite: tilestream = (tile for tile in tilestream if tile not in output_tilestore) if options.rate_limit: - tilestream = imap(RateLimit(options.rate_limit), tilestream) + tilestream = map(RateLimit(options.rate_limit), tilestream) if benchmark: - tilestream = imap(benchmark.sample(), tilestream) + tilestream = map(benchmark.sample(), tilestream) tilestream = input_tilestore.get(tilestream) if benchmark: tilestream = imap(benchmark.sample("get"), tilestream) for i, g in enumerate(generate): tilestream = g.get(tilestream) if options.benchmark: - tilestream = imap(benchmark.sample("generate-%d" % (i,)), tilestream) - tilestream = imap(LogErrors(logger, logging.ERROR, "%(tilecoord)s: %(error)s"), tilestream) + tilestream = map(benchmark.sample("generate-%d" % (i,)), tilestream) + tilestream = map(LogErrors(logger, logging.ERROR, "%(tilecoord)s: %(error)s"), tilestream) if options.statsd: - tilestream = imap(StatsdCountErrors(), tilestream) + tilestream = map(StatsdCountErrors(), tilestream) if options.maximum_consecutive_errors: - tilestream = imap(MaximumConsecutiveErrors(options.maximum_consecutive_errors), tilestream) + tilestream = map(MaximumConsecutiveErrors(options.maximum_consecutive_errors), tilestream) if options.maximum_error_rate: - tilestream = imap(MaximumErrorRate(options.maximum_error_rate), tilestream) + tilestream = map(MaximumErrorRate(options.maximum_error_rate), tilestream) if options.maximum_errors: - tilestream = imap(MaximumErrors(options.maximum_errors), tilestream) - tilestream = imap(DropErrors(), tilestream) + tilestream = map(MaximumErrors(options.maximum_errors), tilestream) + tilestream = map(DropErrors(), tilestream) if options.add_content_type: - tilestream = imap(ContentTypeAdder(), tilestream) + tilestream = map(ContentTypeAdder(), tilestream) tilestream = output_tilestore.put(tilestream) if benchmark: - tilestream = imap(benchmark.sample("put"), tilestream) + tilestream = map(benchmark.sample("put"), tilestream) if options.move: tilestream = input_tilestore.delete(tilestream) if benchmark: - tilestream = imap(benchmark.sample("delete"), tilestream) + tilestream = map(benchmark.sample("delete"), tilestream) if options.verbose: - tilestream = imap(Logger(logger, logging.INFO, "%(tilecoord)s"), tilestream) + tilestream = map(Logger(logger, logging.INFO, "%(tilecoord)s"), tilestream) if options.statsd: - tilestream = imap(StatsdCountTiles(), tilestream) + tilestream = map(StatsdCountTiles(), tilestream) consume(tilestream, options.limit) finally: logging.basicConfig(level=logging.INFO)