← 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: 2011-10-06 18:00:14 UTC
  • mfrom: (6201.1.1 dev_2.4_integration)
  • Revision ID: pqm@pqm.ubuntu.com-20111006180014-3qge365pl5wxnsy9
(gz) Merge 2.4 into dev to resolve conflict in setup.py (Martin Packman)

Show diffs side-by-side

added added

removed removed

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