~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Ian Clatworthy
  • Date: 2010-03-25 07:30:30 UTC
  • mto: (5111.2.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5112.
  • Revision ID: ian.clatworthy@canonical.com-20100325073030-k6b9rwy6804vcm91
Support Python 2.6 in our py2exe scripts

Show diffs side-by-side

added added

removed removed

Lines of Context:
572
572
    if sys.version.startswith('2.4'):
573
573
        # adding elementtree package
574
574
        additional_packages.add('elementtree')
575
 
    elif sys.version.startswith('2.5'):
 
575
    elif sys.version.startswith('2.6') or sys.version.startswith('2.5'):
576
576
        additional_packages.add('xml.etree')
577
577
    else:
578
578
        import warnings