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

+2007-07-20  Michal Ludvig  <michal@logix.cz>

+

+	* setup.py: Check correct Python version and ElementTree availability.

+

 2007-07-05  Michal Ludvig  <michal@logix.cz>

 	* s3cmd: --configure support for Proxy

@@ -4,6 +4,19 @@ import os

 import S3.PkgInfo

+if float("%d.%d" % sys.version_info[:2]) < 2.4:

+	sys.stderr.write("Your Python version %d.%d.%d is not supported.\n" % sys.version_info[:3])

+	sys.stderr.write("S3cmd required Python 2.4 or newer.\n")

+	sys.exit(1)

+

+try:

+	import elementtree.ElementTree as ET

+except ImportError, e:

+	sys.stderr.write(e.message + "\n")

+	sys.stderr.write("Please upgrade to Python 2.5 or install ElementTree module\n")

+	sys.stderr.write("from http://effbot.org/zone/element-index.htm\n")

+	sys.exit(1)

+

 try:

 	## Remove 'MANIFEST' file to force

 	## distutils to recreate it.