/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/patch.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
import os
21
21
from subprocess import Popen, PIPE
22
22
 
23
 
from bzrlib.errors import NoDiff3
24
 
from bzrlib.textfile import check_text_path
 
23
from .errors import NoDiff3
 
24
from .textfile import check_text_path
25
25
 
26
26
"""Diff and patch functionality"""
27
27
 
89
89
    args.extend((mine_path, older_path, yours_path))
90
90
    try:
91
91
        output, stderr, status = write_to_cmd(args)
92
 
    except OSError, e:
 
92
    except OSError as e:
93
93
        if e.errno == errno.ENOENT:
94
94
            raise NoDiff3
95
95
        else: