@@ -1,5 +1,12 @@

 2008-09-15  Michal Ludvig  <michal@logix.cz>

+	* Merge from trunk, revision 238:

+	* s3cmd, S3/S3.py, S3/Utils.py, S3/S3Uri.py, S3/Exceptions.py:

+	  Yet anoter Unicode round. Unicodised all command line arguments 

+	  before processing.

+

+2008-09-15  Michal Ludvig  <michal@logix.cz>

+

 	* Merge from trunk, revision 221:

 	* s3cmd: Refuse 'sync' together with '--encrypt'.

@@ -10,7 +10,15 @@ try:

 except ImportError:

 	import elementtree.ElementTree as ET

-class S3Error (Exception):

+class S3Exception(Exception):

+	def __str__(self):

+		## Is this legal?

+		return unicode(self)

+

+	def __unicode__(self):

+		return self.message

+

+class S3Error (S3Exception):

 	def __init__(self, response):

 		self.status = response["status"]

 		self.reason = response["reason"]

@@ -26,7 +34,7 @@ class S3Error (Exception):

 					debug("ErrorXML: " + child.tag + ": " + repr(child.text))

 					self.info[child.tag] = child.text

-	def __str__(self):

+	def __unicode__(self):

 		retval = "%d (%s)" % (self.status, self.reason)

 		try:

 			retval += (": %s" % self.info["Code"])

@@ -34,13 +42,11 @@ class S3Error (Exception):

 			pass

 		return retval

-class S3UploadError(Exception):

+class S3UploadError(S3Exception):

 	pass

-class S3DownloadError(Exception):

+class S3DownloadError(S3Exception):

 	pass

-class ParameterError(Exception):

+class ParameterError(S3Exception):

 	pass

-

-

@@ -8,6 +8,7 @@ import sys

 from BidirMap import BidirMap

 from logging import debug

 from S3 import S3

+from Utils import unicodise

 class S3Uri(object):

 	type = None

@@ -41,18 +42,6 @@ class S3Uri(object):

 	def public_url(self):

 		raise ValueError("This S3 URI does not have Anonymous URL representation")

-	def _unicodise(self, string):

-		"""

-		Convert 'string' to Unicode or raise an exception.

-		"""

-		debug("Unicodising %r" % string)

-		if type(string) == unicode:

-			return string

-		try:

-			return string.decode("utf-8")

-		except UnicodeDecodeError:

-			raise UnicodeDecodeError("Conversion to unicode failed: %r" % string)

-

 class S3UriS3(S3Uri):

 	type = "s3"

 	_re = re.compile("^s3://([^/]+)/?(.*)", re.IGNORECASE)

@@ -62,7 +51,7 @@ class S3UriS3(S3Uri):

 			raise ValueError("%s: not a S3 URI" % string)

 		groups = match.groups()

 		self._bucket = groups[0]

-		self._object = self._unicodise(groups[1])

+		self._object = unicodise(groups[1])

 	def bucket(self):

 		return self._bucket

@@ -98,7 +87,7 @@ class S3UriS3FS(S3Uri):

 			raise ValueError("%s: not a S3fs URI" % string)

 		groups = match.groups()

 		self._fsname = groups[0]

-		self._path = self._unicodise(groups[1]).split("/")

+		self._path = unicodise(groups[1]).split("/")

 	def fsname(self):

 		return self._fsname

@@ -117,7 +106,7 @@ class S3UriFile(S3Uri):

 		groups = match.groups()

 		if groups[0] not in (None, "file://"):

 			raise ValueError("%s: not a file:// URI" % string)

-		self._path = self._unicodise(groups[1]).split("/")

+		self._path = unicodise(groups[1]).split("/")

 	def path(self):

 		return "/".join(self._path)

@@ -173,3 +173,22 @@ def mkdir_with_parents(dir_name):

 			warning("%s: %s" % (cur_dir, e))

 			return False

 	return True

+

+def unicodise(string):

+	"""

+	Convert 'string' to Unicode or raise an exception.

+	"""

+	debug("Unicodising %r" % string)

+	if type(string) == unicode:

+		return string

+	try:

+		return string.decode("utf-8")

+	except UnicodeDecodeError:

+		raise UnicodeDecodeError("Conversion to unicode failed: %r" % string)

+

+def try_unicodise(string):

+	try:

+		return unicodise(string)

+	except UnicodeDecodeError:

+		return string

+

@@ -21,12 +21,14 @@ from optparse import OptionParser, Option, OptionValueError, IndentedHelpFormatt

 from logging import debug, info, warning, error

 from distutils.spawn import find_executable

-## Output UTF-8 in all cases, even on output redirects

-_unicode_stdout = codecs.getwriter("utf-8")(sys.stdout)

-_unicode_stderr = codecs.getwriter("utf-8")(sys.stderr)

+## Output native on TTY, UTF-8 otherwise (redirects)

+_stdout = sys.stdout.isatty() and sys.stdout or codecs.getwriter("utf-8")(sys.stdout)

+_stderr = sys.stderr.isatty() and sys.stderr or codecs.getwriter("utf-8")(sys.stderr)

+#_stdout = codecs.getwriter("utf-8")(sys.stdout)

+#_stderr = codecs.getwriter("utf-8")(sys.stderr)

 def output(message):

-	_unicode_stdout.write(message + "\n")

+	_stdout.write(message + "\n")

 def check_args_type(args, type, verbose_type):

 	for arg in args:

@@ -926,7 +928,7 @@ def main():

 	## debugging/verbose output for config file parser on request

 	logging.basicConfig(level=options.verbosity,

 	                    format='%(levelname)s: %(message)s',

-	                    stream = _unicode_stderr)

+	                    stream = _stderr)

 	if options.show_version:

 		output("s3cmd version %s" % PkgInfo.version)

@@ -1015,9 +1017,12 @@ def main():

 		error("Missing command. Please run with --help for more information.")

 		sys.exit(1)

+	## Unicodise all remaining arguments:

+	args = [unicodise(arg) for arg in args]

+

 	command = args.pop(0)

 	try:

-		debug("Command: " + commands[command]["cmd"])

+		debug("Command: %s" % commands[command]["cmd"])

 		## We must do this lookup in extra step to 

 		## avoid catching all KeyError exceptions

 		## from inner functions.

@@ -1033,10 +1038,10 @@ def main():

 	try:

 		cmd_func(args)

 	except S3Error, e:

-		error("S3 error: " + str(e))

+		error("S3 error: %s" % e)

 		sys.exit(1)

 	except ParameterError, e:

-		error("Parameter problem: " + str(e))

+		error("Parameter problem: %s" % e)

 		sys.exit(1)

 if __name__ == '__main__':

@@ -1050,6 +1055,7 @@ if __name__ == '__main__':

 		from S3.S3Uri import *

 		from S3 import Utils

 		from S3.Exceptions import *

+		from S3.Utils import unicodise

 		main()

 		sys.exit(0)