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

 import Progress

 from SortedDict import SortedDict

 import httplib

+import locale

 try:

     import json

 except ImportError, e:

@@ -94,7 +95,7 @@ class Config(object):

     # Dict mapping compiled REGEXPs back to their textual form

     debug_exclude = {}

     debug_include = {}

-    encoding = "utf-8"

+    encoding = locale.getpreferredencoding() or "UTF-8"

     urlencoding_mode = "normal"

     log_target_prefix = ""

     reduced_redundancy = False

@@ -11,8 +11,15 @@ import ExitCodes

 try:

     import xml.etree.ElementTree as ET

 except ImportError:

+    # xml.etree.ElementTree was only added in python 2.5

     import elementtree.ElementTree as ET

+try:

+    from xml.etree.ElementTree import ParseError as XmlParseError

+except ImportError:

+    # ParseError was only added in python2.7, before ET was raising ExpatError

+    from xml.parsers.expat import ExpatError as XmlParseError

+

 class S3Exception(Exception):

     def __init__(self, message = ""):

         self.message = unicodise(message)

@@ -49,7 +56,7 @@ class S3Error (S3Exception):

         if response.has_key("data") and response["data"]:

             try:

                 tree = getTreeFromXml(response["data"])

-            except ET.ParseError:

+            except XmlParseError:

                 debug("Not an XML response")

             else:

                 self.info.update(self.parse_error_xml(tree))

@@ -53,7 +53,7 @@ class S3Uri(object):

 class S3UriS3(S3Uri):

     type = "s3"

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

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

     def __init__(self, string):

         match = self._re.match(string)

         if not match:

@@ -47,8 +47,8 @@ else:

 try:

     import xml.etree.ElementTree as ET

 except ImportError:

+    # xml.etree.ElementTree was only added in python 2.5

     import elementtree.ElementTree as ET

-from xml.parsers.expat import ExpatError

 __all__ = []

 def parseNodes(nodes):

@@ -88,11 +88,8 @@ def getTreeFromXml(xml):

         if xmlns:

             tree.attrib['xmlns'] = xmlns

         return tree

-    except ExpatError, e:

-        error(e)

-        raise Exceptions.ParameterError("Bucket contains invalid filenames. Please run: s3cmd fixbucket s3://your-bucket/")

     except Exception, e:

-        error(e)

+        error("Error parsing xml: %s", e)

         error(xml)

         raise

@@ -124,10 +124,20 @@ def cmd_ls(args):

         if uri.type == "s3" and uri.has_bucket():

             subcmd_bucket_list(s3, uri)

             return EX_OK

-    subcmd_buckets_list_all(s3)

+

+    # If not a s3 type uri or no bucket was provided, list all the buckets

+    subcmd_all_buckets_list(s3)

     return EX_OK

-def cmd_buckets_list_all_all(args):

+def subcmd_all_buckets_list(s3):

+

+    response = s3.list_all_buckets()

+

+    for bucket in response["list"]:

+        output(u"%s  s3://%s" % (formatDateTime(bucket["CreationDate"]),

+                                 bucket["Name"]))

+

+def cmd_all_buckets_list_all_content(args):

     s3 = S3(Config())

     response = s3.list_all_buckets()

@@ -137,14 +147,6 @@ def cmd_buckets_list_all_all(args):

         output(u"")

     return EX_OK

-def subcmd_buckets_list_all(s3):

-    response = s3.list_all_buckets()

-    for bucket in response["list"]:

-        output(u"%s  s3://%s" % (

-            formatDateTime(bucket["CreationDate"]),

-            bucket["Name"],

-            ))

-

 def subcmd_bucket_list(s3, uri):

     bucket = uri.bucket()

     prefix = uri.object()

@@ -1969,7 +1971,7 @@ def get_commands_list():

     {"cmd":"mb", "label":"Make bucket", "param":"s3://BUCKET", "func":cmd_bucket_create, "argc":1},

     {"cmd":"rb", "label":"Remove bucket", "param":"s3://BUCKET", "func":cmd_bucket_delete, "argc":1},

     {"cmd":"ls", "label":"List objects or buckets", "param":"[s3://BUCKET[/PREFIX]]", "func":cmd_ls, "argc":0},

-    {"cmd":"la", "label":"List all object in all buckets", "param":"", "func":cmd_buckets_list_all_all, "argc":0},

+    {"cmd":"la", "label":"List all object in all buckets", "param":"", "func":cmd_all_buckets_list_all_content, "argc":0},

     {"cmd":"put", "label":"Put file into bucket", "param":"FILE [FILE...] s3://BUCKET[/PREFIX]", "func":cmd_object_put, "argc":2},

     {"cmd":"get", "label":"Get file from bucket", "param":"s3://BUCKET/OBJECT LOCAL_FILE", "func":cmd_object_get, "argc":1},

     {"cmd":"del", "label":"Delete file from bucket", "param":"s3://BUCKET/OBJECT", "func":cmd_object_del, "argc":1},

@@ -2121,9 +2123,8 @@ def main():

         from os.path import expanduser

         config_file = os.path.join(expanduser("~"), ".s3cfg")

-    preferred_encoding = locale.getpreferredencoding() or "UTF-8"

+    autodetected_encoding = locale.getpreferredencoding() or "UTF-8"

-    optparser.set_defaults(encoding = preferred_encoding)

     optparser.set_defaults(config = config_file)

     optparser.add_option(      "--configure", dest="run_configure", action="store_true", help="Invoke interactive (re)configuration tool. Optionally use as '--configure s3://some-bucket' to test access to a specific bucket instead of attempting to list them all.")

@@ -2191,7 +2192,7 @@ def main():

     optparser.add_option(      "--server-side-encryption", dest="server_side_encryption", action="store_true", help="Specifies that server-side encryption will be used when putting objects. [put, sync, cp, modify]")

-    optparser.add_option(      "--encoding", dest="encoding", metavar="ENCODING", help="Override autodetected terminal and filesystem encoding (character set). Autodetected: %s" % preferred_encoding)

+    optparser.add_option(      "--encoding", dest="encoding", metavar="ENCODING", help="Override autodetected terminal and filesystem encoding (character set). Autodetected: %s" % autodetected_encoding)

     optparser.add_option(      "--add-encoding-exts", dest="add_encoding_exts", metavar="EXTENSIONs", help="Add encoding to these comma delimited extensions i.e. (css,js,html) when uploading to S3 )")

     optparser.add_option(      "--verbatim", dest="urlencoding_mode", action="store_const", const="verbatim", help="Use the S3 name as given on the command line. No pre-processing, encoding, etc. Use with caution!")

@@ -2469,13 +2470,13 @@ def report_exception(e, msg=''):

 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

 """ % msg)

-	if type(e) == ImportError:

-	    s = u' '.join([(a) for a in sys.argv])

-	else:

+        tb = traceback.format_exc(sys.exc_info())

+        try:

             s = u' '.join([unicodise(a) for a in sys.argv])

+        except NameError:

+            s = u' '.join([(a) for a in sys.argv])

         sys.stderr.write(u"Invoked as: %s\n" % s)

-        tb = traceback.format_exc(sys.exc_info())

         e_class = str(e.__class__)

         e_class = e_class[e_class.rfind(".")+1 : -2]

         sys.stderr.write(u"Problem: %s: %s\n" % (e_class, e))

@@ -2529,13 +2530,18 @@ if __name__ == '__main__':

         from S3.CloudFront import CloudFront

         from S3.FileLists import *

         from S3.MultiPart import MultiPartUpload

+    except Exception as e:

+        report_exception(e, "Error loading some components of s3cmd (Import Error)"))

+        # 1 = EX_GENERAL but be safe in that situation

+        sys.exit(1)

+    try:

         rc = main()

         sys.exit(rc)

     except ImportError, e:

         report_exception(e)

-        sys.exit(1)

+        sys.exit(EX_GENERAL)

     except (ParameterError, InvalidFileError), e:

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