Revision 595d480a devflow/versioning.py

b/devflow/versioning.py
51 51
from devflow import utils
52 52

  
53 53

  
54
DEFAULT_VERSION_FILE =\
55
"""__version__ = "%(DEVFLOW_VERSION)s"
54
DEFAULT_VERSION_FILE = """
55
__version__ = "%(DEVFLOW_VERSION)s"
56 56
__version_vcs_info__ = {
57 57
    'branch': '%(DEVFLOW_BRANCH)s',
58 58
    'revid': '%(DEVFLOW_REVISION_ID)s',
......
227 227
                         "'release'" % mode)
228 228
    snap = (mode == "snapshot")
229 229

  
230
    if ((snap and not btype.builds_snapshot) or
231
        (not snap and not btype.builds_release)):  # nopep8
230
    if (snap and not btype.builds_snapshot) or\
231
       (not snap and not btype.builds_release):  # nopep8
232 232
        raise ValueError("Invalid mode '%s' in branch type '%s'" %
233 233
                         (mode, btypestr))
234 234

  
......
365 365
    b = get_base_version(v)
366 366
    mode = utils.get_build_mode()
367 367
    version = python_version(b, v, mode)
368
    debian_version = debian_version_from_python_version(version)
368
    debian_version_ = debian_version_from_python_version(version)
369 369
    env = {"DEVFLOW_VERSION": version,
370
           "DEVFLOW_DEBIAN_VERSION": debian_version,
370
           "DEVFLOW_DEBIAN_VERSION": debian_version_,
371 371
           "DEVFLOW_BRANCH": v.branch,
372 372
           "DEVFLOW_REVISION_ID": v.revid,
373 373
           "DEVFLOW_REVISION_NUMBER": v.revno,

Also available in: Unified diff