/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 breezy/mergetools.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/mergetools.py
24
24
import sys
25
25
import tempfile
26
26
 
27
 
from breezy.lazy_import import lazy_import
 
27
from .lazy_import import lazy_import
28
28
lazy_import(globals(), """
29
29
from breezy import (
30
30
    cmdline,
116
116
    arg = arg.replace('{this}', subst_names['this'])
117
117
    arg = arg.replace('{other}', subst_names['other'])
118
118
    arg = arg.replace('{result}', subst_names['result'])
119
 
    if subst_names.has_key('this_temp'):
 
119
    if 'this_temp' in subst_names:
120
120
        arg = arg.replace('{this_temp}', subst_names['this_temp'])
121
121
    return arg
122
122