[S3tools-commits] SF.net SVN: s3tools:[289] s3cmd/branches/unicode-brainfuck

[<lu...@us...>]

Revision: 289
          http://s3tools.svn.sourceforge.net/s3tools/?rev=289&view=rev
Author:   ludvigm
Date:     2008-12-13 13:07:44 +0000 (Sat, 13 Dec 2008)

Log Message:
-----------
Merge from trunk r288:
* S3/Progress.py: Restructured import Utils to avoid import conflicts.

Modified Paths:
--------------
    s3cmd/branches/unicode-brainfuck/ChangeLog
    s3cmd/branches/unicode-brainfuck/S3/Progress.py

Modified: s3cmd/branches/unicode-brainfuck/ChangeLog
===================================================================
--- s3cmd/branches/unicode-brainfuck/ChangeLog	2008-12-13 13:00:01 UTC (rev 288)
+++ s3cmd/branches/unicode-brainfuck/ChangeLog	2008-12-13 13:07:44 UTC (rev 289)
@@ -1,3 +1,9 @@
+2008-12-14  Michal Ludvig  <mi...@lo...>
+
+    Merge from trunk r288:
+	* S3/Progress.py: Restructured import Utils to avoid import
+	  conflicts.
+
 2008-12-12  Michal Ludvig  <mi...@lo...>
 
 	* s3cmd: Better Exception output. Print sys.path on ImportError,

Modified: s3cmd/branches/unicode-brainfuck/S3/Progress.py
===================================================================
--- s3cmd/branches/unicode-brainfuck/S3/Progress.py	2008-12-13 13:00:01 UTC (rev 288)
+++ s3cmd/branches/unicode-brainfuck/S3/Progress.py	2008-12-13 13:07:44 UTC (rev 289)
@@ -5,7 +5,7 @@
 
 import sys
 import datetime
-from Utils import formatSize
+import Utils
 
 class Progress(object):
 	_stdout = sys.stdout
@@ -59,11 +59,11 @@
 			return
 
 		if self.current_position == self.total_size:
-			print_size = formatSize(self.current_position, True)
+			print_size = Utils.formatSize(self.current_position, True)
 			if print_size[1] != "": print_size[1] += "B"
 			timedelta = self.time_current - self.time_start
 			sec_elapsed = timedelta.days * 86400 + timedelta.seconds + float(timedelta.microseconds)/1000000.0
-			print_speed = formatSize((self.current_position - self.initial_position) / sec_elapsed, True, True)
+			print_speed = Utils.formatSize((self.current_position - self.initial_position) / sec_elapsed, True, True)
 			self._stdout.write("100%%  %s%s in %.2fs (%.2f %sB/s)\n" % 
 				(print_size[0], print_size[1], sec_elapsed, print_speed[0], print_speed[1]))
 			self._stdout.flush()
@@ -100,7 +100,7 @@
 		timedelta = self.time_current - self.time_start
 		sec_elapsed = timedelta.days * 86400 + timedelta.seconds + float(timedelta.microseconds)/1000000.0
 		if (sec_elapsed > 0):
-			print_speed = formatSize((self.current_position - self.initial_position) / sec_elapsed, True, True)
+			print_speed = Utils.formatSize((self.current_position - self.initial_position) / sec_elapsed, True, True)
 		else:
 			print_speed = (0, "")
 		self._stdout.write(self.ANSI_restore_cursor_pos)
@@ -134,7 +134,7 @@
 		timedelta = self.time_current - self.time_start
 		sec_elapsed = timedelta.days * 86400 + timedelta.seconds + float(timedelta.microseconds)/1000000.0
 		if (sec_elapsed > 0):
-			print_speed = formatSize((self.current_position - self.initial_position) / sec_elapsed, True, True)
+			print_speed = Utils.formatSize((self.current_position - self.initial_position) / sec_elapsed, True, True)
 		else:
 			print_speed = (0, "")
 		self._stdout.write(self.CR_char)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.