@@ -1,3 +1,7 @@

 ## Run 'svn propset svn:ignore -F .svnignore .' after you change this list

 *.pyc

 tst.*

+MANIFEST

+dist

+build

+.*.swp

deleted file mode 100644

@@ -1,31 +0,0 @@

-class BidirMap:

-	def __init__(self, **map):

-		self.k2v = {}

-		self.v2k = {}

-		for key in map:

-			self.__setitem__(key, map[key])

-

-	def __setitem__(self, key, value):

-		if self.v2k.has_key(value):

-			if self.v2k[value] != key:

-				raise KeyError("Value '"+str(value)+"' already in use with key '"+str(self.v2k[value])+"'")

-		try:

-			del(self.v2k[self.k2v[key]])

-		except KeyError:

-			pass

-		self.k2v[key] = value

-		self.v2k[value] = key

-

-	def __getitem__(self, key):

-		return self.k2v[key]

-

-	def __str__(self):

-		return self.v2k.__str__()

-

-	def getkey(self, value):

-		return self.v2k[value]

-	

-	def getvalue(self, key):

-		return self.k2v[key]

-

-

deleted file mode 100644

@@ -1,48 +0,0 @@

-import logging

-from logging import debug, info, warning, error

-import re

-

-class ConfigParser:

-	def __init__(self, file, sections = []):

-		self.cfg = {}

-		self.parse_file(file, sections)

-	

-	def parse_file(self, file, sections = []):

-		info("ConfigParser: Reading file '%s'" % file)

-		if type(sections) != type([]):

-			sections = [sections]

-		in_our_section = True

-		f = open(file, "r")

-		r_comment = re.compile("^\s*#.*")

-		r_empty = re.compile("^\s*$")

-		r_section = re.compile("^\[([^\]]+)\]")

-		r_data = re.compile("^\s*(?P<key>\w+)\s*=\s*(?P<value>.*)")

-		r_quotes = re.compile("^\"(.*)\"\s*$")

-		for line in f:

-			if r_comment.match(line) or r_empty.match(line):

-				continue

-			is_section = r_section.match(line)

-			if is_section:

-				section = is_section.groups()[0]

-				in_our_section = (section in sections) or (len(sections) == 0)

-				continue

-			is_data = r_data.match(line)

-			if is_data and in_our_section:

-				data = is_data.groupdict()

-				if r_quotes.match(data["value"]):

-					data["value"] = data["value"][1:-1]

-				debug("ConfigParser: %s->%s" % (data["key"], data["value"]))

-				self.__setitem__(data["key"], data["value"])

-				continue

-			warning("Ignoring invalid line in '%s': %s" % (file, line))

-

-	def __getitem__(self, name):

-		return self.cfg[name]

-	

-	def __setitem__(self, name, value):

-		self.cfg[name] = value

-	

-	def get(self, name, default = None):

-		if self.cfg.has_key(name):

-			return self.cfg[name]

-		return default

new file mode 100644

@@ -0,0 +1,31 @@

+class BidirMap:

+	def __init__(self, **map):

+		self.k2v = {}

+		self.v2k = {}

+		for key in map:

+			self.__setitem__(key, map[key])

+

+	def __setitem__(self, key, value):

+		if self.v2k.has_key(value):

+			if self.v2k[value] != key:

+				raise KeyError("Value '"+str(value)+"' already in use with key '"+str(self.v2k[value])+"'")

+		try:

+			del(self.v2k[self.k2v[key]])

+		except KeyError:

+			pass

+		self.k2v[key] = value

+		self.v2k[value] = key

+

+	def __getitem__(self, key):

+		return self.k2v[key]

+

+	def __str__(self):

+		return self.v2k.__str__()

+

+	def getkey(self, value):

+		return self.v2k[value]

+	

+	def getvalue(self, key):

+		return self.k2v[key]

+

+

new file mode 100644

@@ -0,0 +1,48 @@

+import logging

+from logging import debug, info, warning, error

+import re

+

+class ConfigParser:

+	def __init__(self, file, sections = []):

+		self.cfg = {}

+		self.parse_file(file, sections)

+	

+	def parse_file(self, file, sections = []):

+		info("ConfigParser: Reading file '%s'" % file)

+		if type(sections) != type([]):

+			sections = [sections]

+		in_our_section = True

+		f = open(file, "r")

+		r_comment = re.compile("^\s*#.*")

+		r_empty = re.compile("^\s*$")

+		r_section = re.compile("^\[([^\]]+)\]")

+		r_data = re.compile("^\s*(?P<key>\w+)\s*=\s*(?P<value>.*)")

+		r_quotes = re.compile("^\"(.*)\"\s*$")

+		for line in f:

+			if r_comment.match(line) or r_empty.match(line):

+				continue

+			is_section = r_section.match(line)

+			if is_section:

+				section = is_section.groups()[0]

+				in_our_section = (section in sections) or (len(sections) == 0)

+				continue

+			is_data = r_data.match(line)

+			if is_data and in_our_section:

+				data = is_data.groupdict()

+				if r_quotes.match(data["value"]):

+					data["value"] = data["value"][1:-1]

+				debug("ConfigParser: %s->%s" % (data["key"], data["value"]))

+				self.__setitem__(data["key"], data["value"])

+				continue

+			warning("Ignoring invalid line in '%s': %s" % (file, line))

+

+	def __getitem__(self, name):

+		return self.cfg[name]

+	

+	def __setitem__(self, name, value):

+		self.cfg[name] = value

+	

+	def get(self, name, default = None):

+		if self.cfg.has_key(name):

+			return self.cfg[name]

+		return default

new file mode 100644

@@ -0,0 +1,42 @@

+class SortedDictIterator:

+	def __init__(self, dict):

+		self.dict = dict

+		self.keys = dict.keys()

+		self.index = 0

+		self.length = len(self.keys)

+

+	def next(self):

+		if self.length <= self.index:

+			raise StopIteration

+

+		retval = self.keys[self.index]

+		self.index += 1

+		return retval

+

+

+class SortedDict(dict):

+	def __setitem__(self, name, value):

+		try:

+			value = value.strip()

+		except:

+			pass

+		dict.__setitem__(self, name.lower(), value)

+

+	def __iter__(self):

+		return SortedDictIterator(self)

+	

+

+	def keys(self):

+		keys = dict.keys(self)

+		keys.sort()

+		return keys

+	

+	def popitem(self):

+		keys = self.keys()

+		if len(keys) < 1:

+			raise KeyError("popitem(): dictionary is empty")

+		retval = (keys[0], dict.__getitem__(self, keys[0]))

+		dict.__delitem__(self, keys[0])

+		return retval

+

+

new file mode 100644

@@ -0,0 +1,65 @@

+import time

+import re

+import elementtree.ElementTree as ET

+

+def parseNodes(nodes, xmlns = ""):

+	retval = []

+	for node in nodes:

+		retval_item = {}

+		if xmlns != "":

+			## Take regexp compilation out of the loop

+			r = re.compile(xmlns)

+			fixup = lambda string : r.sub("", string)

+		else:

+			## Do-nothing function

+			fixup = lambda string : string

+

+		for child in node.getchildren():

+			name = fixup(child.tag)

+			retval_item[name] = node.findtext(".//%s" % child.tag)

+

+		retval.append(retval_item)

+	return retval

+

+def getNameSpace(element):

+	if not element.tag.startswith("{"):

+		return ""

+	return re.compile("^(\{[^}]+\})").match(element.tag).groups()[0]

+

+def getListFromXml(xml, node):

+	tree = ET.fromstring(xml)

+	xmlns = getNameSpace(tree)

+	nodes = tree.findall('.//%s%s' % (xmlns, node))

+	return parseNodes(nodes, xmlns)

+	

+def dateS3toPython(date):

+	date = re.compile("\.\d\d\dZ").sub(".000Z", date)

+	return time.strptime(date, "%Y-%m-%dT%H:%M:%S.000Z")

+

+def dateS3toUnix(date):

+	## FIXME: This should be timezone-aware.

+	## Currently the argument to strptime() is GMT but mktime() 

+	## treats it as "localtime". Anyway...

+	return time.mktime(dateS3toPython(date))

+

+def formatSize(size, human_readable = False):

+	size = int(size)

+	if human_readable:

+		coeffs = ['k', 'M', 'G', 'T']

+		coeff = ""

+		while size > 2048:

+			size /= 1024

+			coeff = coeffs.pop(0)

+		return (size, coeff)

+	else:

+		return (size, "")

+

+def formatDateTime(s3timestamp):

+	return time.strftime("%Y-%m-%d %H:%M", dateS3toPython(s3timestamp))

+

+def convertTupleListToDict(list):

+	retval = {}

+	for tuple in list:

+		retval[tuple[0]] = tuple[1]

+	return retval

+

new file mode 100644

deleted file mode 100644

@@ -1,42 +0,0 @@

-class SortedDictIterator:

-	def __init__(self, dict):

-		self.dict = dict

-		self.keys = dict.keys()

-		self.index = 0

-		self.length = len(self.keys)

-

-	def next(self):

-		if self.length <= self.index:

-			raise StopIteration

-

-		retval = self.keys[self.index]

-		self.index += 1

-		return retval

-

-

-class SortedDict(dict):

-	def __setitem__(self, name, value):

-		try:

-			value = value.strip()

-		except:

-			pass

-		dict.__setitem__(self, name.lower(), value)

-

-	def __iter__(self):

-		return SortedDictIterator(self)

-	

-

-	def keys(self):

-		keys = dict.keys(self)

-		keys.sort()

-		return keys

-	

-	def popitem(self):

-		keys = self.keys()

-		if len(keys) < 1:

-			raise KeyError("popitem(): dictionary is empty")

-		retval = (keys[0], dict.__getitem__(self, keys[0]))

-		dict.__delitem__(self, keys[0])

-		return retval

-

-

@@ -1,5 +1,10 @@

 #!/usr/bin/env python

+## Amazon S3 manager

+## Author: Michal Ludvig <michal@logix.cz>

+##         http://www.logix.cz/michal

+## License: GPL Version 2

+

 import httplib2

 import sys

 import os, os.path

@@ -16,10 +21,10 @@ from stat import ST_SIZE

 import elementtree.ElementTree as ET

 ## Our modules

-from utils import *

-from SortedDict import SortedDict

-from BidirMap import BidirMap

-from ConfigParser import ConfigParser

+from S3.utils import *

+from S3.SortedDict import SortedDict

+from S3.BidirMap import BidirMap

+from S3.ConfigParser import ConfigParser

 class AwsConfig:

 	parsed_files = []

deleted file mode 100644

@@ -1,65 +0,0 @@

-import time

-import re

-import elementtree.ElementTree as ET

-

-def parseNodes(nodes, xmlns = ""):

-	retval = []

-	for node in nodes:

-		retval_item = {}

-		if xmlns != "":

-			## Take regexp compilation out of the loop

-			r = re.compile(xmlns)

-			fixup = lambda string : r.sub("", string)

-		else:

-			## Do-nothing function

-			fixup = lambda string : string

-

-		for child in node.getchildren():

-			name = fixup(child.tag)

-			retval_item[name] = node.findtext(".//%s" % child.tag)

-

-		retval.append(retval_item)

-	return retval

-

-def getNameSpace(element):

-	if not element.tag.startswith("{"):

-		return ""

-	return re.compile("^(\{[^}]+\})").match(element.tag).groups()[0]

-

-def getListFromXml(xml, node):

-	tree = ET.fromstring(xml)

-	xmlns = getNameSpace(tree)

-	nodes = tree.findall('.//%s%s' % (xmlns, node))

-	return parseNodes(nodes, xmlns)

-	

-def dateS3toPython(date):

-	date = re.compile("\.\d\d\dZ").sub(".000Z", date)

-	return time.strptime(date, "%Y-%m-%dT%H:%M:%S.000Z")

-

-def dateS3toUnix(date):

-	## FIXME: This should be timezone-aware.

-	## Currently the argument to strptime() is GMT but mktime() 

-	## treats it as "localtime". Anyway...

-	return time.mktime(dateS3toPython(date))

-

-def formatSize(size, human_readable = False):

-	size = int(size)

-	if human_readable:

-		coeffs = ['k', 'M', 'G', 'T']

-		coeff = ""

-		while size > 2048:

-			size /= 1024

-			coeff = coeffs.pop(0)

-		return (size, coeff)

-	else:

-		return (size, "")

-

-def formatDateTime(s3timestamp):

-	return time.strftime("%Y-%m-%d %H:%M", dateS3toPython(s3timestamp))

-

-def convertTupleListToDict(list):

-	retval = {}

-	for tuple in list:

-		retval[tuple[0]] = tuple[1]

-	return retval

-