Major refactoring - avoid use of 'from XX import *' in favor of more

normal 'import XXX' syntax.  The previous way was an artifact from
earlier versions where the whole program fit in one file.


git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@252 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109

1 files changed, 76 insertions, 81 deletions

diff --git a/rdiff-backup/rdiff_backup/manage.py b/rdiff-backup/rdiff_backup/manage.py
index 2e1d7b6..f974147 100644
--- a/rdiff-backup/rdiff_backup/manage.py
+++ b/rdiff-backup/rdiff_backup/manage.py
@@ -20,91 +20,86 @@
 """list, delete, and otherwise manage increments"""
 
 from __future__ import generators
-from static import *
-from log import *
-import Globals, Time
+from log import Log
+import Globals, Time, static, manage
 
 
 class ManageException(Exception): pass
 
-class Manage:
-	def get_file_type(rp):
-		"""Returns one of "regular", "directory", "missing", or "special"."""
-		if not rp.lstat(): return "missing"
-		elif rp.isdir(): return "directory"
-		elif rp.isreg(): return "regular"
-		else: return "special"
-	
-	def get_inc_type(inc):
-		"""Return file type increment represents"""
-		assert inc.isincfile()
-		type = inc.getinctype()
-		if type == "dir": return "directory"
-		elif type == "diff": return "regular"
-		elif type == "missing": return "missing"
-		elif type == "snapshot": return Manage.get_file_type(inc)
-		else: assert None, "Unknown type %s" % (type,)
-
-	def describe_incs_parsable(incs, mirror_time, mirrorrp):
-		"""Return a string parsable by computer describing the increments
-
-		Each line is a time in seconds of the increment, and then the
-		type of the file.  It will be sorted oldest to newest.  For example:
-
-		10000 regular
-		20000 directory
-		30000 special
-		40000 missing
-		50000 regular    <- last will be the current mirror
-
-		"""
-		incpairs = [(Time.stringtotime(inc.getinctime()), inc) for inc in incs]
-		incpairs.sort()
-		result = ["%s %s" % (time, Manage.get_inc_type(inc))
-				  for time, inc in incpairs]
-		result.append("%s %s" % (mirror_time, Manage.get_file_type(mirrorrp)))
-		return "\n".join(result)
-
-	def describe_incs_human(incs, mirror_time, mirrorrp):
-		"""Return a string describing all the the root increments"""
-		incpairs = [(Time.stringtotime(inc.getinctime()), inc) for inc in incs]
-		incpairs.sort()
-
-		result = ["Found %d increments:" % len(incpairs)]
-		for time, inc in incpairs:
-			result.append("    %s   %s" %
-						  (inc.dirsplit()[1], Time.timetopretty(time)))
-		result.append("Current mirror: %s" % Time.timetopretty(mirror_time))
-		return "\n".join(result)
-
-	def delete_earlier_than(baserp, time):
-		"""Deleting increments older than time in directory baserp
-
-		time is in seconds.  It will then delete any empty directories
-		in the tree.  To process the entire backup area, the
-		rdiff-backup-data directory should be the root of the tree.
-
-		"""
-		baserp.conn.Manage.delete_earlier_than_local(baserp, time)
-
-	def delete_earlier_than_local(baserp, time):
-		"""Like delete_earlier_than, but run on local connection for speed"""
-		assert baserp.conn is Globals.local_connection
-		def yield_files(rp):
-			yield rp
-			if rp.isdir():
-				for filename in rp.listdir():
-					for sub_rp in yield_files(rp.append(filename)):
-						yield sub_rp
-
-		for rp in yield_files(baserp):
-			if ((rp.isincfile() and
-				 Time.stringtotime(rp.getinctime()) < time) or
-				(rp.isdir() and not rp.listdir())):
-				Log("Deleting increment file %s" % rp.path, 5)
-				rp.delete()
-
-MakeStatic(Manage)
+def get_file_type(rp):
+	"""Returns one of "regular", "directory", "missing", or "special"."""
+	if not rp.lstat(): return "missing"
+	elif rp.isdir(): return "directory"
+	elif rp.isreg(): return "regular"
+	else: return "special"
+
+def get_inc_type(inc):
+	"""Return file type increment represents"""
+	assert inc.isincfile()
+	type = inc.getinctype()
+	if type == "dir": return "directory"
+	elif type == "diff": return "regular"
+	elif type == "missing": return "missing"
+	elif type == "snapshot": return get_file_type(inc)
+	else: assert None, "Unknown type %s" % (type,)
+
+def describe_incs_parsable(incs, mirror_time, mirrorrp):
+	"""Return a string parsable by computer describing the increments
+
+	Each line is a time in seconds of the increment, and then the
+	type of the file.  It will be sorted oldest to newest.  For example:
+
+	10000 regular
+	20000 directory
+	30000 special
+	40000 missing
+	50000 regular    <- last will be the current mirror
+
+	"""
+	incpairs = [(Time.stringtotime(inc.getinctime()), inc) for inc in incs]
+	incpairs.sort()
+	result = ["%s %s" % (time, get_inc_type(inc)) for time, inc in incpairs]
+	result.append("%s %s" % (mirror_time, get_file_type(mirrorrp)))
+	return "\n".join(result)
+
+def describe_incs_human(incs, mirror_time, mirrorrp):
+	"""Return a string describing all the the root increments"""
+	incpairs = [(Time.stringtotime(inc.getinctime()), inc) for inc in incs]
+	incpairs.sort()
+
+	result = ["Found %d increments:" % len(incpairs)]
+	for time, inc in incpairs:
+		result.append("    %s   %s" %
+					  (inc.dirsplit()[1], Time.timetopretty(time)))
+	result.append("Current mirror: %s" % Time.timetopretty(mirror_time))
+	return "\n".join(result)
+
+def delete_earlier_than(baserp, time):
+	"""Deleting increments older than time in directory baserp
+
+	time is in seconds.  It will then delete any empty directories
+	in the tree.  To process the entire backup area, the
+	rdiff-backup-data directory should be the root of the tree.
+
+	"""
+	baserp.conn.manage.delete_earlier_than_local(baserp, time)
+
+def delete_earlier_than_local(baserp, time):
+	"""Like delete_earlier_than, but run on local connection for speed"""
+	assert baserp.conn is Globals.local_connection
+	def yield_files(rp):
+		yield rp
+		if rp.isdir():
+			for filename in rp.listdir():
+				for sub_rp in yield_files(rp.append(filename)):
+					yield sub_rp
+
+	for rp in yield_files(baserp):
+		if ((rp.isincfile() and
+			 Time.stringtotime(rp.getinctime()) < time) or
+			(rp.isdir() and not rp.listdir())):
+			Log("Deleting increment file %s" % rp.path, 5)
+			rp.delete()
 
 
 class IncObj: