From bde4c28e386fb6957cf305556e88d0eacb980c9f Mon Sep 17 00:00:00 2001 From: mhagger Date: Sat, 28 Nov 2009 10:18:41 +0000 Subject: [PATCH] Import whole modules rather than individual functions. git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@4973 be7e6eca-30d4-0310-a8e5-ac0d63af7087 --- cvs2svn_lib/sort.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/cvs2svn_lib/sort.py b/cvs2svn_lib/sort.py index 7826f66d..5ea48c73 100644 --- a/cvs2svn_lib/sort.py +++ b/cvs2svn_lib/sort.py @@ -29,12 +29,9 @@ under the MIT license. import os -from heapq import heapify -from heapq import heappop -from heapq import heappush -from itertools import islice -from itertools import cycle -from tempfile import gettempdir +import heapq +import itertools +import tempfile def merge(chunks, key=None): @@ -55,10 +52,10 @@ def merge(chunks, key=None): except: pass else: - heappush(values, ((key(value), index, value, iterator, chunk))) + heapq.heappush(values, ((key(value), index, value, iterator, chunk))) while values: - k, index, value, iterator, chunk = heappop(values) + k, index, value, iterator, chunk = heapq.heappop(values) yield value try: value = iterator.next() @@ -70,12 +67,12 @@ def merge(chunks, key=None): except: pass else: - heappush(values, (key(value), index, value, iterator, chunk)) + heapq.heappush(values, (key(value), index, value, iterator, chunk)) def sort_file(input, output, key=None, buffer_size=32000, tempdirs=[]): if not tempdirs: - tempdirs = [gettempdir()] + tempdirs = [tempfile.gettempdir()] input_file = file(input, 'rb', 64*1024) try: @@ -83,8 +80,8 @@ def sort_file(input, output, key=None, buffer_size=32000, tempdirs=[]): chunks = [] try: - for tempdir in cycle(tempdirs): - current_chunk = list(islice(input_iterator, buffer_size)) + for tempdir in itertools.cycle(tempdirs): + current_chunk = list(itertools.islice(input_iterator, buffer_size)) if current_chunk: current_chunk.sort(key=key) output_chunk = file( -- 2.11.4.GIT