Rev 5112: (igc) Support python 2.6 in py2exe setup scripts in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5112 [merge]
revision-id: pqm at pqm.ubuntu.com-20100325081424-674xjyvnoudkglip
parent: pqm at pqm.ubuntu.com-20100325065238-0mser11okatoq0yz
parent: ian.clatworthy at canonical.com-20100325074050-0x40v1aqzllvyt1x
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2010-03-25 08:14:24 +0000
message:
  (igc) Support python 2.6 in py2exe setup scripts
modified:
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
=== modified file 'setup.py'
--- a/setup.py	2010-03-11 04:33:41 +0000
+++ b/setup.py	2010-03-25 07:30:30 +0000
@@ -572,7 +572,7 @@
     if sys.version.startswith('2.4'):
         # adding elementtree package
         additional_packages.add('elementtree')
-    elif sys.version.startswith('2.5'):
+    elif sys.version.startswith('2.6') or sys.version.startswith('2.5'):
         additional_packages.add('xml.etree')
     else:
         import warnings