/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Andrew Bennetts
  • Date: 2010-03-26 04:47:45 UTC
  • mfrom: (5116 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5117.
  • Revision ID: andrew.bennetts@canonical.com-20100326044745-ubvt5tmse1a17s1f
Merge lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
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