@@ -1,5 +1,6 @@

 2009-02-25  Michal Ludvig  <michal@logix.cz>

+	* s3cmd: Fixed reporting of ImportError of S3 modules.

 	* s3cmd: Fixed Error: global name 'real_filename' is not defined

 2009-02-24  Michal Ludvig  <michal@logix.cz>

@@ -1552,36 +1552,7 @@ def main():

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

 		sys.exit(1)

-if __name__ == '__main__':

-	try:

-		## Our modules

-		## Keep them in try/except block to 

-		## detect any syntax errors in there

-		from S3 import PkgInfo

-		from S3.S3 import *

-		from S3.Config import Config

-		from S3.S3Uri import *

-		from S3 import Utils

-		from S3.Exceptions import *

-		from S3.Utils import unicodise

-		from S3.Progress import Progress

-		from S3.CloudFront import Cmd as CfCmd

-

-		main()

-		sys.exit(0)

-

-	except ParameterError, e:

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

-		sys.exit(1)

-

-	except SystemExit, e:

-		sys.exit(e.code)

-

-	except KeyboardInterrupt:

-		sys.stderr.write("See ya!\n")

-		sys.exit(1)

-

-	except Exception, e:

+def report_exception(e):

 		sys.stderr.write("""

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

     An unexpected error has occurred.

@@ -1598,15 +1569,16 @@ if __name__ == '__main__':

 			sys.stderr.write("S3cmd:   %s\n" % PkgInfo.version)

 		except NameError:

 			sys.stderr.write("S3cmd:   unknown version. Module import problem?\n")

-		sys.stderr.write("Python:  %s\n" % sys.version.replace('\n', ' '))

 		sys.stderr.write("\n")

 		sys.stderr.write(unicode(tb, errors="replace"))

+

 		if type(e) == ImportError:

 			sys.stderr.write("\n")

 			sys.stderr.write("Your sys.path contains these entries:\n")

 			for path in sys.path:

 				sys.stderr.write(u"\t%s\n" % path)

-			sys.stderr.write("Now the question is where has S3/S3.py been installed?\n")

+			sys.stderr.write("Now the question is where have the s3cmd modules been installed?\n")

+

 		sys.stderr.write("""

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

     An unexpected error has occurred.

@@ -1614,4 +1586,40 @@ if __name__ == '__main__':

    s3tools-bugs@lists.sourceforge.net

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

 """)

+

+if __name__ == '__main__':

+	try:

+		## Our modules

+		## Keep them in try/except block to 

+		## detect any syntax errors in there

+		from S3 import PkgInfo

+		from S3.S3 import *

+		from S3.Config import Config

+		from S3.S3Uri import *

+		from S3 import Utils

+		from S3.Exceptions import *

+		from S3.Utils import unicodise

+		from S3.Progress import Progress

+		from S3.CloudFront import Cmd as CfCmd

+

+		main()

+		sys.exit(0)

+

+	except ImportError, e:

+		report_exception(e)

+		sys.exit(1)

+		

+	except ParameterError, e:

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

+		sys.exit(1)

+

+	except SystemExit, e:

+		sys.exit(e.code)

+

+	except KeyboardInterrupt:

+		sys.stderr.write("See ya!\n")

+		sys.exit(1)

+

+	except Exception, e:

+		report_exception(e)

 		sys.exit(1)