← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Marius Kruger
  • Date: 2007-01-19 19:23:53 UTC
  • mto: This revision was merged to the branch mainline in revision 2241.
  • Revision ID: amanic@gmail.com-20070119192353-i96mfa4bsya9thdu
* Fix errors.py import order
* Atemt to handle exceptions better in WorkingTree._move

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
18
18
"""
19
19
 
20
20
 
21
 
from bzrlib import (symbol_versioning,
22
 
                    osutils,)
23
 
from bzrlib.patches import (PatchSyntax, 
24
 
                            PatchConflict, 
25
 
                            MalformedPatchHeader,
26
 
                            MalformedHunkHeader,
27
 
                            MalformedLine,)
 
21
from bzrlib import (
 
22
    osutils,
 
23
    symbol_versioning,
 
24
    )
 
25
from bzrlib.patches import (
 
26
    MalformedHunkHeader,
 
27
    MalformedLine,
 
28
    MalformedPatchHeader,
 
29
    PatchConflict,
 
30
    PatchSyntax,
 
31
    )
28
32
 
29
33
 
30
34
# TODO: is there any value in providing the .args field used by standard
337
341
class RenameFailedFilesExist(BzrError):
338
342
    """Used when renaming and both source and dest exist."""
339
343
 
340
 
    _fmt = ("Could not rename %(source)s to %(dest)s because both files exist."
 
344
    _fmt = ("Could not rename %(source)s => %(dest)s because both files exist."
341
345
         "%(extra)s")
342
346
 
343
347
    def __init__(self, source, dest, extra=None):