← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
470
470
 
471
471
def get_svn_py2exe_info(includes, excludes, packages):
472
472
    packages.append('subvertpy')
 
473
    packages.append('sqlite3')
473
474
 
474
475
 
475
476
if 'bdist_wininst' in sys.argv:
572
573
    if sys.version.startswith('2.4'):
573
574
        # adding elementtree package
574
575
        additional_packages.add('elementtree')
575
 
    elif sys.version.startswith('2.5'):
 
576
    elif sys.version.startswith('2.6') or sys.version.startswith('2.5'):
576
577
        additional_packages.add('xml.etree')
577
578
    else:
578
579
        import warnings