← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Patch Queue Manager
  • Date: 2013-05-20 17:46:29 UTC
  • mfrom: (6573.1.1 bzr)
  • Revision ID: pqm@pqm.ubuntu.com-20130520174629-dp7zujtuclvomuzd
(jameinel) Fix CVE 2013-2009. Avoid allowing multiple wildcards in a single
 SSL cert hostname segment. (Andrew Starr-Bochicchio)

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
172
172
## Setup
173
173
########################
174
174
 
175
 
from tools.build_mo import build_mo
 
175
from bzrlib.bzr_distutils import build_mo
176
176
 
177
177
command_classes = {'install_scripts': my_install_scripts,
178
178
                   'build': bzr_build,
202
202
    from distutils.command.build_ext import build_ext
203
203
else:
204
204
    have_pyrex = True
205
 
    import re
206
 
    _version = re.match("^[0-9.]+", pyrex_version).group(0)
207
 
    pyrex_version_info = tuple(map(int, _version.split('.')))
 
205
    pyrex_version_info = tuple(map(int, pyrex_version.rstrip("+").split('.')))
208
206
 
209
207
 
210
208
class build_ext_if_possible(build_ext):
433
431
    # PyQt4 itself still escapes the plugin detection code for some reason...
434
432
    includes.append('PyQt4.QtCore')
435
433
    includes.append('PyQt4.QtGui')
 
434
    includes.append('PyQt4.QtTest')
436
435
    includes.append('sip') # extension module required for Qt.
437
436
    packages.append('pygments') # colorizer for qbzr
438
437
    packages.append('docutils') # html formatting
484
483
    packages.append('sqlite3')
485
484
 
486
485
 
 
486
def get_git_py2exe_info(includes, excludes, packages):
 
487
    packages.append('dulwich')
 
488
 
 
489
 
487
490
def get_fastimport_py2exe_info(includes, excludes, packages):
488
491
    # This is the python-fastimport package, not to be confused with the
489
492
    # bzr-fastimport plugin.
682
685
    if 'svn' in plugins:
683
686
        get_svn_py2exe_info(includes, excludes, packages)
684
687
 
 
688
    if 'git' in plugins:
 
689
        get_git_py2exe_info(includes, excludes, packages)
 
690
 
685
691
    if 'fastimport' in plugins:
686
692
        get_fastimport_py2exe_info(includes, excludes, packages)
687
693