Merge lp:~jelmer/brz/move-errors-views into lp:brz

[Jelmer Vernooij]

Move a few more errors out of breezy.errors.

Move a few more errors to their respective modules, out of breezy.errors:

 * views
 * shelf
 * smtp

[Martin Packman (gz)]

Changes look okay.

review: Approve

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2017-07-21 14:18:24 +0000
+++ breezy/builtins.py	2017-07-23 16:06:20 +0000
@@ -245,7 +245,7 @@
             if view_files:
                 for filename in file_list:
                     if not osutils.is_inside_any(view_files, filename):
-                        raise errors.FileOutsideView(filename, view_files)
+                        raise views.FileOutsideView(filename, view_files)
         file_list = file_list[:]
         file_list[0] = tree.abspath(relpath)
     else:
@@ -299,7 +299,7 @@
         current_view = tree.views.get_view_info()[0]
         if current_view is not None:
             view_info = (current_view, tree.views.lookup_view())
-    except errors.ViewsNotSupported:
+    except views.ViewsNotSupported:
         pass
     return view_info
 
@@ -3040,7 +3040,7 @@
                     else:
                         fullpath = fp
                     views.check_path_in_view(tree, fullpath)
-                except errors.FileOutsideView:
+                except views.FileOutsideView:
                     continue
 
             # Output the entry

=== modified file 'breezy/bzr/smart/medium.py'
--- breezy/bzr/smart/medium.py	2017-06-11 20:15:04 +0000
+++ breezy/bzr/smart/medium.py	2017-07-23 16:06:20 +0000
@@ -41,7 +41,6 @@
 
 from breezy import (
     debug,
-    errors,
     trace,
     transport,
     ui,
@@ -51,7 +50,10 @@
 from breezy.bzr.smart import client, protocol, request, signals, vfs
 from breezy.transport import ssh
 """)
-from ... import osutils
+from ... import (
+    errors,
+    osutils,
+    )
 
 # Throughout this module buffer size parameters are either limited to be at
 # most _MAX_READ_SIZE, or are ignored and _MAX_READ_SIZE is used instead.
@@ -59,6 +61,17 @@
 # from non-sockets as well.
 _MAX_READ_SIZE = osutils.MAX_SOCKET_CHUNK
 
+
+class HpssVfsRequestNotAllowed(errors.BzrError):
+
+    _fmt = ("VFS requests over the smart server are not allowed. Encountered: "
+            "%(method)s, %(arguments)s.")
+
+    def __init__(self, method, arguments):
+        self.method = method
+        self.arguments = arguments
+
+
 def _get_protocol_factory_for_bytes(bytes):
     """Determine the right protocol factory for 'bytes'.
 
@@ -656,7 +669,7 @@
             # A method we don't know about doesn't count as a VFS method.
             return
         if issubclass(request_method, vfs.VfsRequest):
-            raise errors.HpssVfsRequestNotAllowed(params.method, params.args)
+            raise HpssVfsRequestNotAllowed(params.method, params.args)
 
 
 class _DebugCounter(object):

=== modified file 'breezy/bzr/smart/request.py'
--- breezy/bzr/smart/request.py	2017-06-11 20:15:04 +0000
+++ breezy/bzr/smart/request.py	2017-07-23 16:06:20 +0000
@@ -58,6 +58,15 @@
 jail_info.transports = None
 
 
+class DisabledMethod(errors.InternalBzrError):
+
+    _fmt = "The smart server method '%(class_name)s' is disabled."
+
+    def __init__(self, class_name):
+        errors.BzrError.__init__(self)
+        self.class_name = class_name
+
+
 def _install_hook():
     bzrdir.BzrDir.hooks.install_named_hook(
         'pre_open', _pre_open_hook, 'checking server jail')

=== modified file 'breezy/bzr/smart/vfs.py'
--- breezy/bzr/smart/vfs.py	2017-06-11 20:15:04 +0000
+++ breezy/bzr/smart/vfs.py	2017-07-23 16:06:20 +0000
@@ -60,7 +60,7 @@
 
     def _check_enabled(self):
         if not vfs_enabled():
-            raise errors.DisabledMethod(self.__class__.__name__)
+            raise request.DisabledMethod(self.__class__.__name__)
 
     def translate_client_path(self, relpath):
         # VFS requests are made with escaped paths so the escaping done in

=== modified file 'breezy/commands.py'
--- breezy/commands.py	2017-07-20 00:00:04 +0000
+++ breezy/commands.py	2017-07-23 16:06:20 +0000
@@ -61,6 +61,27 @@
     _fmt = "Error in command line options"
 
 
+class CommandAvailableInPlugin(Exception):
+
+    internal_error = False
+
+    def __init__(self, cmd_name, plugin_metadata, provider):
+
+        self.plugin_metadata = plugin_metadata
+        self.cmd_name = cmd_name
+        self.provider = provider
+
+    def __str__(self):
+
+        _fmt = ('"%s" is not a standard brz command. \n'
+                'However, the following official plugin provides this command: %s\n'
+                'You can install it by going to: %s'
+                % (self.cmd_name, self.plugin_metadata['name'],
+                    self.plugin_metadata['url']))
+
+        return _fmt
+
+
 class CommandInfo(object):
     """Information about a command."""
 
@@ -325,13 +346,16 @@
     return cmd
 
 
+class NoPluginAvailable(errors.BzrError):
+    pass
+
+
 def _try_plugin_provider(cmd_name):
     """Probe for a plugin provider having cmd_name."""
     try:
         plugin_metadata, provider = probe_for_provider(cmd_name)
-        raise errors.CommandAvailableInPlugin(cmd_name,
-            plugin_metadata, provider)
-    except errors.NoPluginAvailable:
+        raise CommandAvailableInPlugin(cmd_name, plugin_metadata, provider)
+    except NoPluginAvailable:
         pass
 
 
@@ -346,9 +370,9 @@
     for provider in command_providers_registry:
         try:
             return provider.plugin_for_command(cmd_name), provider
-        except errors.NoPluginAvailable:
+        except NoPluginAvailable:
             pass
-    raise errors.NoPluginAvailable(cmd_name)
+    raise NoPluginAvailable(cmd_name)
 
 
 def _get_bzr_command(cmd_or_None, cmd_name):

=== modified file 'breezy/errors.py'
--- breezy/errors.py	2017-07-21 14:18:24 +0000
+++ breezy/errors.py	2017-07-23 16:06:20 +0000
@@ -146,11 +146,6 @@
     internal_error = True
 
 
-class AlreadyBuilding(BzrError):
-
-    _fmt = "The tree builder is already building a tree."
-
-
 class BranchError(BzrError):
     """Base class for concrete 'errors about a branch'."""
 
@@ -177,15 +172,6 @@
         self.msg = msg
 
 
-class DisabledMethod(InternalBzrError):
-
-    _fmt = "The smart server method '%(class_name)s' is disabled."
-
-    def __init__(self, class_name):
-        BzrError.__init__(self)
-        self.class_name = class_name
-
-
 class IncompatibleVersion(BzrError):
 
     _fmt = 'API %(api)s is not compatible; one of versions %(wanted)r '\
@@ -301,11 +287,6 @@
         self.base = base
 
 
-class NotBuilding(BzrError):
-
-    _fmt = "Not currently building a tree."
-
-
 class NotLocalUrl(BzrError):
 
     _fmt = "%(url)s is not a local path."
@@ -2503,11 +2484,6 @@
         self.name = name.decode("utf-8")
 
 
-class NoDestinationAddress(InternalBzrError):
-
-    _fmt = "Message does not have a destination address."
-
-
 class RepositoryDataStreamError(BzrError):
 
     _fmt = "Corrupt or incompatible data stream: %(reason)s"
@@ -2516,48 +2492,6 @@
         self.reason = reason
 
 
-class SMTPError(BzrError):
-
-    _fmt = "SMTP error: %(error)s"
-
-    def __init__(self, error):
-        self.error = error
-
-
-class NoMessageSupplied(BzrError):
-
-    _fmt = "No message supplied."
-
-
-class NoMailAddressSpecified(BzrError):
-
-    _fmt = "No mail-to address (--mail-to) or output (-o) specified."
-
-
-class MailClientNotFound(BzrError):
-
-    _fmt = "Unable to find mail client with the following names:"\
-        " %(mail_command_list_string)s"
-
-    def __init__(self, mail_command_list):
-        mail_command_list_string = ', '.join(mail_command_list)
-        BzrError.__init__(self, mail_command_list=mail_command_list,
-                          mail_command_list_string=mail_command_list_string)
-
-class SMTPConnectionRefused(SMTPError):
-
-    _fmt = "SMTP connection to %(host)s refused"
-
-    def __init__(self, error, host):
-        self.error = error
-        self.host = host
-
-
-class DefaultSMTPConnectionRefused(SMTPConnectionRefused):
-
-    _fmt = "Please specify smtp_server.  No server at default %(host)s."
-
-
 class BzrDirError(BzrError):
 
     def __init__(self, controldir):
@@ -2708,31 +2642,6 @@
         self.timezone = timezone
 
 
-class CommandAvailableInPlugin(Exception):
-
-    internal_error = False
-
-    def __init__(self, cmd_name, plugin_metadata, provider):
-
-        self.plugin_metadata = plugin_metadata
-        self.cmd_name = cmd_name
-        self.provider = provider
-
-    def __str__(self):
-
-        _fmt = ('"%s" is not a standard brz command. \n'
-                'However, the following official plugin provides this command: %s\n'
-                'You can install it by going to: %s'
-                % (self.cmd_name, self.plugin_metadata['name'],
-                    self.plugin_metadata['url']))
-
-        return _fmt
-
-
-class NoPluginAvailable(BzrError):
-    pass
-
-
 class UnableEncodePath(BzrError):
 
     _fmt = ('Unable to encode %(kind)s path %(path)r in '
@@ -2804,11 +2713,6 @@
         self.msg = msg
 
 
-class ShelfCorrupt(BzrError):
-
-    _fmt = "Shelf corrupt."
-
-
 class DecompressCorruption(BzrError):
 
     _fmt = "Corruption while decompressing repository file%(orig_error)s"
@@ -2821,22 +2725,6 @@
         BzrError.__init__(self)
 
 
-class NoSuchShelfId(BzrError):
-
-    _fmt = 'No changes are shelved with id "%(shelf_id)d".'
-
-    def __init__(self, shelf_id):
-        BzrError.__init__(self, shelf_id=shelf_id)
-
-
-class InvalidShelfId(BzrError):
-
-    _fmt = '"%(invalid_id)s" is not a valid shelf id, try a number instead.'
-
-    def __init__(self, invalid_id):
-        BzrError.__init__(self, invalid_id=invalid_id)
-
-
 class JailBreak(BzrError):
 
     _fmt = "An attempt to access a url outside the server jail was made: '%(url)s'."
@@ -2858,37 +2746,6 @@
         BzrError.__init__(self, format=format, url=url)
 
 
-class NoSuchView(BzrError):
-    """A view does not exist.
-    """
-
-    _fmt = u"No such view: %(view_name)s."
-
-    def __init__(self, view_name):
-        self.view_name = view_name
-
-
-class ViewsNotSupported(BzrError):
-    """Views are not supported by a tree format.
-    """
-
-    _fmt = ("Views are not supported by %(tree)s;"
-            " use 'brz upgrade' to change your tree to a later format.")
-
-    def __init__(self, tree):
-        self.tree = tree
-
-
-class FileOutsideView(BzrError):
-
-    _fmt = ('Specified file "%(file_name)s" is outside the current view: '
-            '%(view_str)s')
-
-    def __init__(self, file_name, view_files):
-        self.file_name = file_name
-        self.view_str = ", ".join(view_files)
-
-
 class UnresumableWriteGroup(BzrError):
 
     _fmt = ("Repository %(repository)s cannot resume write group "
@@ -2953,16 +2810,6 @@
         self.branch_url = branch_url
 
 
-class HpssVfsRequestNotAllowed(BzrError):
-
-    _fmt = ("VFS requests over the smart server are not allowed. Encountered: "
-            "%(method)s, %(arguments)s.")
-
-    def __init__(self, method, arguments):
-        self.method = method
-        self.arguments = arguments
-
-
 class UnsupportedKindChange(BzrError):
 
     _fmt = ("Kind change from %(from_kind)s to %(to_kind)s for "

=== modified file 'breezy/mail_client.py'
--- breezy/mail_client.py	2017-06-05 20:48:31 +0000
+++ breezy/mail_client.py	2017-07-23 16:06:20 +0000
@@ -36,6 +36,28 @@
 mail_client_registry = registry.Registry()
 
 
+class MailClientNotFound(errors.BzrError):
+
+    _fmt = "Unable to find mail client with the following names:"\
+        " %(mail_command_list_string)s"
+
+    def __init__(self, mail_command_list):
+        mail_command_list_string = ', '.join(mail_command_list)
+        errors.BzrError.__init__(
+            self, mail_command_list=mail_command_list,
+            mail_command_list_string=mail_command_list_string)
+
+
+class NoMessageSupplied(errors.BzrError):
+
+    _fmt = "No message supplied."
+
+
+class NoMailAddressSpecified(errors.BzrError):
+
+    _fmt = "No mail-to address (--mail-to) or output (-o) specified."
+
+
 class MailClient(object):
     """A mail client that can send messages with attachements."""
 
@@ -107,10 +129,10 @@
                 extension, basename=None, body=None):
         """See MailClient.compose"""
         if not to:
-            raise errors.NoMailAddressSpecified()
+            raise NoMailAddressSpecified()
         body = msgeditor.edit_commit_message(prompt, start_message=body)
         if body == '':
-            raise errors.NoMessageSupplied()
+            raise NoMessageSupplied()
         email_message.EmailMessage.send(self.config,
                                         self.config.get('email'),
                                         to,
@@ -190,7 +212,7 @@
             else:
                 break
         else:
-            raise errors.MailClientNotFound(self._client_commands)
+            raise MailClientNotFound(self._client_commands)
 
     def _get_compose_commandline(self, to, subject, attach_path, body):
         """Determine the commandline to use for composing a message
@@ -365,7 +387,7 @@
                 'body=' + urlutils.quote(self._encode_safe(body)))
         # to must be supplied for the claws-mail --compose syntax to work.
         if to is None:
-            raise errors.NoMailAddressSpecified()
+            raise NoMailAddressSpecified()
         compose_url = 'mailto:%s?%s' % (
             self._encode_safe(to), '&'.join(compose_url))
         # Collect command-line options.
@@ -396,7 +418,7 @@
     def _get_compose_commandline(self, to, subject, attach_path, body=None):
         """See ExternalMailClient._get_compose_commandline"""
         if not to:
-            raise errors.NoMailAddressSpecified()
+            raise NoMailAddressSpecified()
         commandline = [self._encode_safe(to)]
         if subject is not None:
             commandline.extend(['--subject', self._encode_safe(subject)])
@@ -535,7 +557,7 @@
                                 attach_path)
         except simplemapi.MAPIError as e:
             if e.code != simplemapi.MAPI_USER_ABORT:
-                raise errors.MailClientNotFound(['MAPI supported mail client'
+                raise MailClientNotFound(['MAPI supported mail client'
                                                  ' (error %d)' % (e.code,)])
 mail_client_registry.register('mapi', MAPIClient,
                               help=MAPIClient.__doc__)
@@ -620,7 +642,7 @@
             return self._mail_client().compose(prompt, to, subject,
                                                attachment, mime_subtype,
                                                extension, basename, body)
-        except errors.MailClientNotFound:
+        except MailClientNotFound:
             return Editor(self.config).compose(prompt, to, subject,
                           attachment, mime_subtype, extension, body)
 
@@ -630,7 +652,7 @@
         try:
             return self._mail_client().compose_merge_request(to, subject,
                     directive, basename=basename, body=body)
-        except errors.MailClientNotFound:
+        except MailClientNotFound:
             return Editor(self.config).compose_merge_request(to, subject,
                           directive, basename=basename, body=body)
 mail_client_registry.register('default', DefaultMail,

=== modified file 'breezy/shelf.py'
--- breezy/shelf.py	2017-06-24 13:32:35 +0000
+++ breezy/shelf.py	2017-07-23 16:06:20 +0000
@@ -19,11 +19,11 @@
 import errno
 import re
 
+from . import errors
 from .lazy_import import lazy_import
 lazy_import(globals(), """
 from breezy import (
     bencode,
-    errors,
     merge,
     merge3,
     transform,
@@ -34,6 +34,27 @@
 """)
 
 
+class ShelfCorrupt(errors.BzrError):
+
+    _fmt = "Shelf corrupt."
+
+
+class NoSuchShelfId(errors.BzrError):
+
+    _fmt = 'No changes are shelved with id "%(shelf_id)d".'
+
+    def __init__(self, shelf_id):
+        errors.BzrError.__init__(self, shelf_id=shelf_id)
+
+
+class InvalidShelfId(errors.BzrError):
+
+    _fmt = '"%(invalid_id)s" is not a valid shelf id, try a number instead.'
+
+    def __init__(self, invalid_id):
+        errors.BzrError.__init__(self, invalid_id=invalid_id)
+
+
 class ShelfCreator(object):
     """Create a transform to shelve objects and its inverse."""
 
@@ -318,7 +339,7 @@
     def parse_metadata(records):
         names, metadata_bytes = next(records)
         if names[0] != ('metadata',):
-            raise errors.ShelfCorrupt
+            raise ShelfCorrupt
         metadata = bencode.bdecode(metadata_bytes)
         message = metadata.get('message')
         if message is not None:
@@ -409,8 +430,7 @@
         except IOError as e:
             if e.errno != errno.ENOENT:
                 raise
-            from . import errors
-            raise errors.NoSuchShelfId(shelf_id)
+            raise NoSuchShelfId(shelf_id)
 
     def get_unshelver(self, shelf_id):
         """Return an unshelver for a given shelf_id.

=== modified file 'breezy/shelf_ui.py'
--- breezy/shelf_ui.py	2017-06-24 13:32:35 +0000
+++ breezy/shelf_ui.py	2017-07-23 16:06:20 +0000
@@ -398,7 +398,7 @@
                 try:
                     shelf_id = int(shelf_id)
                 except ValueError:
-                    raise errors.InvalidShelfId(shelf_id)
+                    raise shelf.InvalidShelfId(shelf_id)
             else:
                 shelf_id = manager.last_shelf()
                 if shelf_id is None:

=== modified file 'breezy/smtp_connection.py'
--- breezy/smtp_connection.py	2017-06-05 20:48:31 +0000
+++ breezy/smtp_connection.py	2017-07-23 16:06:20 +0000
@@ -28,10 +28,8 @@
     osutils,
     )
 from .errors import (
-    NoDestinationAddress,
-    SMTPError,
-    DefaultSMTPConnectionRefused,
-    SMTPConnectionRefused,
+    BzrError,
+    InternalBzrError,
     )
 
 
@@ -49,6 +47,35 @@
 ''')
 
 
+class SMTPError(BzrError):
+
+    _fmt = "SMTP error: %(error)s"
+
+    def __init__(self, error):
+        self.error = error
+
+
+class SMTPConnectionRefused(SMTPError):
+
+    _fmt = "SMTP connection to %(host)s refused"
+
+    def __init__(self, error, host):
+        self.error = error
+        self.host = host
+
+
+class DefaultSMTPConnectionRefused(SMTPConnectionRefused):
+
+    _fmt = "Please specify smtp_server.  No server at default %(host)s."
+
+
+
+class NoDestinationAddress(InternalBzrError):
+
+    _fmt = "Message does not have a destination address."
+
+
+
 class SMTPConnection(object):
     """Connect to an SMTP server and send an email.
 

=== modified file 'breezy/tests/__init__.py'
--- breezy/tests/__init__.py	2017-07-02 13:44:33 +0000
+++ breezy/tests/__init__.py	2017-07-23 16:06:20 +0000
@@ -4053,6 +4053,7 @@
         'breezy.tests.test_version_info',
         'breezy.tests.test_versionedfile',
         'breezy.tests.test_vf_search',
+        'breezy.tests.test_views',
         'breezy.tests.test_weave',
         'breezy.tests.test_whitebox',
         'breezy.tests.test_win32utils',

=== modified file 'breezy/tests/per_workingtree/test_views.py'
--- breezy/tests/per_workingtree/test_views.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/per_workingtree/test_views.py	2017-07-23 16:06:20 +0000
@@ -21,7 +21,7 @@
 """
 
 
-from breezy import views, errors
+from breezy import views as _mod_views
 from breezy.tests import TestNotApplicable, TestSkipped
 from breezy.workingtree import WorkingTree
 
@@ -64,7 +64,7 @@
         self.assertEqual(view_current, current)
         self.assertEqual(view_dict, views)
         # test setting a current view which does not exist
-        self.assertRaises(errors.NoSuchView,
+        self.assertRaises(_mod_views.NoSuchView,
             wt.views.set_view_info, 'yet-another', view_dict)
         current, views = wt.views.get_view_info()
         self.assertEqual(view_current, current)
@@ -116,7 +116,7 @@
         wt = self.make_branch_and_tree('wt')
         try:
             wt.views.lookup_view('opaque')
-        except errors.NoSuchView as e:
+        except _mod_views.NoSuchView as e:
             self.assertEqual(e.view_name, 'opaque')
             self.assertEqual(str(e), 'No such view: opaque.')
         else:
@@ -130,15 +130,15 @@
         # now try to delete it
         wt.views.delete_view(view_name)
         # now you can't look it up
-        self.assertRaises(errors.NoSuchView,
+        self.assertRaises(_mod_views.NoSuchView,
             wt.views.lookup_view, view_name)
         # and it's not in the dictionary
         self.assertEqual(wt.views.get_view_info()[1], {})
         # and you can't remove it a second time
-        self.assertRaises(errors.NoSuchView,
+        self.assertRaises(_mod_views.NoSuchView,
             wt.views.delete_view, view_name)
         # or remove a view that never existed
-        self.assertRaises(errors.NoSuchView,
+        self.assertRaises(_mod_views.NoSuchView,
             wt.views.delete_view, view_name + '2')
 
     def test_check_path_in_view(self):
@@ -148,14 +148,14 @@
             view_current: ['dir-1'],
             'other-name': ['dir-2']}
         wt.views.set_view_info(view_current, view_dict)
-        self.assertEqual(views.check_path_in_view(wt, 'dir-1'), None)
-        self.assertEqual(views.check_path_in_view(wt, 'dir-1/sub'), None)
-        self.assertRaises(errors.FileOutsideView,
-                          views.check_path_in_view, wt, 'dir-2')
-        self.assertRaises(errors.FileOutsideView,
-                          views.check_path_in_view, wt, 'dir-2/sub')
-        self.assertRaises(errors.FileOutsideView,
-                          views.check_path_in_view, wt, 'other')
+        self.assertEqual(_mod_views.check_path_in_view(wt, 'dir-1'), None)
+        self.assertEqual(_mod_views.check_path_in_view(wt, 'dir-1/sub'), None)
+        self.assertRaises(_mod_views.FileOutsideView,
+                          _mod_views.check_path_in_view, wt, 'dir-2')
+        self.assertRaises(_mod_views.FileOutsideView,
+                          _mod_views.check_path_in_view, wt, 'dir-2/sub')
+        self.assertRaises(_mod_views.FileOutsideView,
+                          _mod_views.check_path_in_view, wt, 'other')
 
 
 class TestUnsupportedViews(TestCaseWithWorkingTree):
@@ -176,13 +176,13 @@
 
     def test_view_methods_raise(self):
         wt = self.make_branch_and_tree('wt')
-        self.assertRaises(errors.ViewsNotSupported,
+        self.assertRaises(_mod_views.ViewsNotSupported,
                 wt.views.set_view_info, 'bar', {'bar': ['bars/']})
-        self.assertRaises(errors.ViewsNotSupported,
+        self.assertRaises(_mod_views.ViewsNotSupported,
                 wt.views.get_view_info)
-        self.assertRaises(errors.ViewsNotSupported,
+        self.assertRaises(_mod_views.ViewsNotSupported,
             wt.views.lookup_view, 'foo')
-        self.assertRaises(errors.ViewsNotSupported,
+        self.assertRaises(_mod_views.ViewsNotSupported,
             wt.views.set_view, 'foo', 'bar')
-        self.assertRaises(errors.ViewsNotSupported,
+        self.assertRaises(_mod_views.ViewsNotSupported,
             wt.views.delete_view, 'foo')

=== modified file 'breezy/tests/test_errors.py'
--- breezy/tests/test_errors.py	2017-07-21 14:18:24 +0000
+++ breezy/tests/test_errors.py	2017-07-23 16:06:20 +0000
@@ -77,11 +77,6 @@
             " appears to be corrupt: trailing garbage: \"x\"",
             str(error))
 
-    def test_disabled_method(self):
-        error = errors.DisabledMethod("class name")
-        self.assertEqualDiff(
-            "The smart server method 'class name' is disabled.", str(error))
-
     def test_duplicate_file_id(self):
         error = errors.DuplicateFileId('a_file_id', 'foo')
         self.assertEqualDiff('File id {a_file_id} already exists in inventory'
@@ -548,28 +543,6 @@
         self.assertEqual(str(err), "Branching 'bar'(foo) must create a"
                                    " working tree.")
 
-    def test_no_such_view(self):
-        err = errors.NoSuchView('foo')
-        self.assertEqual("No such view: foo.", str(err))
-
-    def test_views_not_supported(self):
-        err = errors.ViewsNotSupported('atree')
-        err_str = str(err)
-        self.assertStartsWith(err_str, "Views are not supported by ")
-        self.assertEndsWith(err_str, "; use 'brz upgrade' to change your "
-            "tree to a later format.")
-
-    def test_file_outside_view(self):
-        err = errors.FileOutsideView('baz', ['foo', 'bar'])
-        self.assertEqual('Specified file "baz" is outside the current view: '
-                         'foo, bar', str(err))
-
-    def test_invalid_shelf_id(self):
-        invalid_id = "foo"
-        err = errors.InvalidShelfId(invalid_id)
-        self.assertEqual('"foo" is not a valid shelf id, '
-                         'try a number instead.', str(err))
-
     def test_unresumable_write_group(self):
         repo = "dummy repo"
         wg_tokens = ['token']

=== modified file 'breezy/tests/test_mail_client.py'
--- breezy/tests/test_mail_client.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_mail_client.py	2017-07-23 16:06:20 +0000
@@ -118,7 +118,7 @@
 
     def test_commandline(self):
         xdg_email = mail_client.XDGEmail(None)
-        self.assertRaises(errors.NoMailAddressSpecified,
+        self.assertRaises(mail_client.NoMailAddressSpecified,
                           xdg_email._get_compose_commandline,
                           None, None, 'file%')
         commandline = xdg_email._get_compose_commandline(
@@ -233,7 +233,7 @@
 
     def test_to_required(self):
         claws = mail_client.Claws(None)
-        self.assertRaises(errors.NoMailAddressSpecified,
+        self.assertRaises(mail_client.NoMailAddressSpecified,
                           claws._get_compose_commandline,
                           None, None, 'file%')
 

=== modified file 'breezy/tests/test_shelf.py'
--- breezy/tests/test_shelf.py	2017-06-08 23:30:31 +0000
+++ breezy/tests/test_shelf.py	2017-07-23 16:06:20 +0000
@@ -43,6 +43,15 @@
                "17:_removed_contentsle11:_removed_idle14:_tree_path_idsdeeE")
 
 
+class TestErrors(tests.TestCase):
+
+    def test_invalid_shelf_id(self):
+        invalid_id = "foo"
+        err = shelf.InvalidShelfId(invalid_id)
+        self.assertEqual('"foo" is not a valid shelf id, '
+                         'try a number instead.', str(err))
+
+
 class TestPrepareShelf(tests.TestCaseWithTransport):
 
     def prepare_shelve_rename(self):
@@ -622,7 +631,7 @@
                                                                 'foo'))])
         shelf_file = open('shelf', 'rb')
         self.addCleanup(shelf_file.close)
-        e = self.assertRaises(errors.ShelfCorrupt,
+        e = self.assertRaises(shelf.ShelfCorrupt,
                               shelf.Unshelver.from_tree_and_shelf, tree,
                               shelf_file)
         self.assertEqual('Shelf corrupt.', str(e))
@@ -733,7 +742,7 @@
 
     def test_read_non_existant(self):
         manager = self.get_manager()
-        e = self.assertRaises(errors.NoSuchShelfId, manager.read_shelf, 1)
+        e = self.assertRaises(shelf.NoSuchShelfId, manager.read_shelf, 1)
         self.assertEqual('No changes are shelved with id "1".', str(e))
 
     def test_shelve_changes(self):

=== modified file 'breezy/tests/test_shelf_ui.py'
--- breezy/tests/test_shelf_ui.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_shelf_ui.py	2017-07-23 16:06:20 +0000
@@ -23,6 +23,7 @@
     errors,
     shelf_ui,
     revision,
+    shelf,
     tests,
     )
 from ..sixish import (
@@ -568,7 +569,7 @@
             shelf_file.write('garbage')
         finally:
             shelf_file.close()
-        self.assertRaises(errors.InvalidShelfId,
+        self.assertRaises(shelf.InvalidShelfId,
             shelf_ui.Unshelver.from_args, directory='tree',
             action='delete-only', shelf_id='foo')
 

=== modified file 'breezy/tests/test_smart_request.py'
--- breezy/tests/test_smart_request.py	2017-06-11 20:15:04 +0000
+++ breezy/tests/test_smart_request.py	2017-07-23 16:06:20 +0000
@@ -90,6 +90,14 @@
         self.jail_transports_log.append(request.jail_info.transports)
 
 
+class ErrorTests(TestCase):
+
+    def test_disabled_method(self):
+        error = request.DisabledMethod("class name")
+        self.assertEqualDiff(
+            "The smart server method 'class name' is disabled.", str(error))
+
+
 class TestSmartRequest(TestCase):
 
     def test_request_class_without_do_body(self):

=== modified file 'breezy/tests/test_smart_transport.py'
--- breezy/tests/test_smart_transport.py	2017-06-11 20:15:04 +0000
+++ breezy/tests/test_smart_transport.py	2017-07-23 16:06:20 +0000
@@ -1796,7 +1796,7 @@
         # set environment variable after construction to make sure it's
         # examined.
         self.overrideEnv('BRZ_NO_SMART_VFS', '')
-        self.assertRaises(errors.DisabledMethod, handler.execute)
+        self.assertRaises(_mod_request.DisabledMethod, handler.execute)
 
     def test_readonly_exception_becomes_transport_not_possible(self):
         """The response for a read-only error is ('ReadOnlyError')."""

=== modified file 'breezy/tests/test_smtp_connection.py'
--- breezy/tests/test_smtp_connection.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/test_smtp_connection.py	2017-07-23 16:06:20 +0000
@@ -22,7 +22,6 @@
 from breezy import (
     config,
     email_message,
-    errors,
     smtp_connection,
     tests,
     ui,
@@ -106,10 +105,11 @@
 
     def test_missing_server(self):
         conn = self.get_connection('', smtp_factory=connection_refuser)
-        self.assertRaises(errors.DefaultSMTPConnectionRefused, conn._connect)
+        self.assertRaises(smtp_connection.DefaultSMTPConnectionRefused,
+                          conn._connect)
         conn = self.get_connection('smtp_server=smtp.example.com',
                                    smtp_factory=connection_refuser)
-        self.assertRaises(errors.SMTPConnectionRefused, conn._connect)
+        self.assertRaises(smtp_connection.SMTPConnectionRefused, conn._connect)
 
     def test_smtp_username(self):
         conn = self.get_connection('')
@@ -195,7 +195,7 @@
         # Check that we raise an exception if both EHLO and HELO fail.
         factory = StubSMTPFactory(fail_on=['ehlo', 'helo'])
         conn = self.get_connection('', smtp_factory=factory)
-        self.assertRaises(errors.SMTPError, conn._create_connection)
+        self.assertRaises(smtp_connection.SMTPError, conn._create_connection)
         self.assertEqual([('connect', 'localhost'),
                           ('ehlo',),
                           ('helo',)], factory._calls)
@@ -218,7 +218,7 @@
         factory = StubSMTPFactory(fail_on=['starttls'],
                                   smtp_features=['starttls'])
         conn = self.get_connection('', smtp_factory=factory)
-        self.assertRaises(errors.SMTPError, conn._create_connection)
+        self.assertRaises(smtp_connection.SMTPError, conn._create_connection)
         self.assertEqual([('connect', 'localhost'),
                           ('ehlo',),
                           ('has_extn', 'starttls'),
@@ -257,18 +257,18 @@
         msg = Message()
         msg['From'] = '"J. Random Developer" <[e-mail]>'
         self.assertRaises(
-            errors.NoDestinationAddress,
+            smtp_connection.NoDestinationAddress,
             smtp_connection.SMTPConnection(config.MemoryStack("")
                                            ).send_email, msg)
 
         msg = email_message.EmailMessage('[e-mail]', '', 'subject')
         self.assertRaises(
-            errors.NoDestinationAddress,
+            smtp_connection.NoDestinationAddress,
             smtp_connection.SMTPConnection(config.MemoryStack("")
                                            ).send_email, msg)
 
         msg = email_message.EmailMessage('[e-mail]', [], 'subject')
         self.assertRaises(
-            errors.NoDestinationAddress,
+            smtp_connection.NoDestinationAddress,
             smtp_connection.SMTPConnection(config.MemoryStack("")
                                            ).send_email, msg)

=== modified file 'breezy/tests/test_treebuilder.py'
--- breezy/tests/test_treebuilder.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/test_treebuilder.py	2017-07-23 16:06:20 +0000
@@ -20,7 +20,11 @@
 from breezy import errors, tests
 from breezy.memorytree import MemoryTree
 from breezy.tests import TestCaseWithTransport
-from breezy.treebuilder import TreeBuilder
+from breezy.treebuilder import (
+    AlreadyBuilding,
+    NotBuilding,
+    TreeBuilder,
+    )
 
 
 class FakeTree(object):
@@ -63,11 +67,11 @@
         builder = TreeBuilder()
         tree = FakeTree()
         builder.start_tree(tree)
-        self.assertRaises(errors.AlreadyBuilding, builder.start_tree, tree)
+        self.assertRaises(AlreadyBuilding, builder.start_tree, tree)
 
     def test_finish_tree_not_started_errors(self):
         builder = TreeBuilder()
-        self.assertRaises(errors.NotBuilding, builder.finish_tree)
+        self.assertRaises(NotBuilding, builder.finish_tree)
 
     def test_finish_tree_unlocks(self):
         builder = TreeBuilder()
@@ -78,7 +82,7 @@
 
     def test_build_tree_not_started_errors(self):
         builder = TreeBuilder()
-        self.assertRaises(errors.NotBuilding, builder.build, "foo")
+        self.assertRaises(NotBuilding, builder.build, "foo")
 
     def test_build_tree(self):
         """Test building works using a MemoryTree."""

=== added file 'breezy/tests/test_views.py'
--- breezy/tests/test_views.py	1970-01-01 00:00:00 +0000
+++ breezy/tests/test_views.py	2017-07-23 16:06:20 +0000
@@ -0,0 +1,44 @@
+# Copyright (C) 2005-2011 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+from __future__ import absolute_import
+
+from . import TestCase
+
+from ..views import (
+    FileOutsideView,
+    NoSuchView,
+    ViewsNotSupported,
+    )
+
+
+class TestErrors(TestCase):
+
+    def test_no_such_view(self):
+        err = NoSuchView('foo')
+        self.assertEqual("No such view: foo.", str(err))
+
+    def test_views_not_supported(self):
+        err = ViewsNotSupported('atree')
+        err_str = str(err)
+        self.assertStartsWith(err_str, "Views are not supported by ")
+        self.assertEndsWith(err_str, "; use 'brz upgrade' to change your "
+            "tree to a later format.")
+
+    def test_file_outside_view(self):
+        err = FileOutsideView('baz', ['foo', 'bar'])
+        self.assertEqual('Specified file "baz" is outside the current view: '
+                         'foo, bar', str(err))

=== modified file 'breezy/treebuilder.py'
--- breezy/treebuilder.py	2017-05-22 00:56:52 +0000
+++ breezy/treebuilder.py	2017-07-23 16:06:20 +0000
@@ -25,6 +25,16 @@
 from . import errors
 
 
+class AlreadyBuilding(errors.BzrError):
+
+    _fmt = "The tree builder is already building a tree."
+
+
+class NotBuilding(errors.BzrError):
+
+    _fmt = "Not currently building a tree."
+
+
 class TreeBuilder(object):
     """A TreeBuilder allows the creation of specific content in one tree at a
     time.
@@ -59,7 +69,7 @@
     def _ensure_building(self):
         """Raise NotBuilding if there is no current tree being built."""
         if self._tree is None:
-            raise errors.NotBuilding
+            raise NotBuilding
 
     def finish_tree(self):
         """Finish building the current tree."""
@@ -75,6 +85,6 @@
             MutableTree interface.
         """
         if self._tree is not None:
-            raise errors.AlreadyBuilding
+            raise AlreadyBuilding
         self._tree = tree
         self._tree.lock_tree_write()

=== modified file 'breezy/views.py'
--- breezy/views.py	2017-05-22 00:56:52 +0000
+++ breezy/views.py	2017-07-23 16:06:20 +0000
@@ -36,6 +36,37 @@
 _VIEWS_FORMAT1_MARKER = "Bazaar views format 1\n"
 
 
+class NoSuchView(errors.BzrError):
+    """A view does not exist.
+    """
+
+    _fmt = u"No such view: %(view_name)s."
+
+    def __init__(self, view_name):
+        self.view_name = view_name
+
+
+class ViewsNotSupported(errors.BzrError):
+    """Views are not supported by a tree format.
+    """
+
+    _fmt = ("Views are not supported by %(tree)s;"
+            " use 'brz upgrade' to change your tree to a later format.")
+
+    def __init__(self, tree):
+        self.tree = tree
+
+
+class FileOutsideView(errors.BzrError):
+
+    _fmt = ('Specified file "%(file_name)s" is outside the current view: '
+            '%(view_str)s')
+
+    def __init__(self, file_name, view_files):
+        self.file_name = file_name
+        self.view_str = ", ".join(view_files)
+
+
 class _Views(object):
     """Base class for View managers."""
 
@@ -95,7 +126,7 @@
         :param views: a map from view name to list of files/directories
         """
         if current is not None and current not in views:
-            raise errors.NoSuchView(current)
+            raise NoSuchView(current)
         self.tree.lock_write()
         try:
             self._current = current
@@ -119,7 +150,7 @@
                     return []
             return self._views[view_name]
         except KeyError:
-            raise errors.NoSuchView(view_name)
+            raise NoSuchView(view_name)
 
     def set_view(self, view_name, view_files, make_current=True):
         """Add or update a view definition.
@@ -149,7 +180,7 @@
             try:
                 del self._views[view_name]
             except KeyError:
-                raise errors.NoSuchView(view_name)
+                raise NoSuchView(view_name)
             if view_name == self._current:
                 self._current = None
             self._save_view_info()
@@ -256,7 +287,7 @@
         return False
 
     def _not_supported(self, *a, **k):
-        raise errors.ViewsNotSupported(self.tree)
+        raise ViewsNotSupported(self.tree)
 
     get_view_info = _not_supported
     set_view_info = _not_supported
@@ -282,4 +313,4 @@
     if tree.supports_views():
         view_files = tree.views.lookup_view()
         if  view_files and not osutils.is_inside_any(view_files, relpath):
-            raise errors.FileOutsideView(relpath, view_files)
+            raise FileOutsideView(relpath, view_files)

=== modified file 'breezy/workingtree.py'
--- breezy/workingtree.py	2017-07-02 21:26:29 +0000
+++ breezy/workingtree.py	2017-07-23 16:06:20 +0000
@@ -327,7 +327,7 @@
         for filename in file_list:
             relpath = fixer(osutils.dereference_path(filename))
             if view_files and not osutils.is_inside_any(view_files, relpath):
-                raise errors.FileOutsideView(filename, view_files)
+                raise views.FileOutsideView(filename, view_files)
             new_list.append(relpath)
         return new_list