Update remaining error imports to avoid dulwich.errors.

dulwich/tests/test_grafts.py

@@ -23,9 +23,9 @@ import os
 import tempfile
 import shutil
 
-from dulwich.errors import ObjectFormatException
 from dulwich.tests import TestCase
 from dulwich.objects import (
+    ObjectFormatException,
     Tree,
     )
 from dulwich.repo import (

dulwich/tests/test_hooks.py

@@ -24,13 +24,12 @@ import stat
 import shutil
 import tempfile
 
-from dulwich import errors
-
 from dulwich.hooks import (
+    HookError,
     PreCommitShellHook,
     PostCommitShellHook,
     CommitMsgShellHook,
-)
+    )
 
 from dulwich.tests import TestCase
 
@@ -62,7 +61,7 @@ exit 0
             f.write(pre_commit_fail)
         os.chmod(pre_commit, stat.S_IREAD | stat.S_IWRITE | stat.S_IEXEC)
 
-        self.assertRaises(errors.HookError, hook.execute)
+        self.assertRaises(HookError, hook.execute)
 
         with open(pre_commit, 'w') as f:
             f.write(pre_commit_success)
@@ -91,7 +90,7 @@ exit 0
             f.write(commit_msg_fail)
         os.chmod(commit_msg, stat.S_IREAD | stat.S_IWRITE | stat.S_IEXEC)
 
-        self.assertRaises(errors.HookError, hook.execute, b'failed commit')
+        self.assertRaises(HookError, hook.execute, b'failed commit')
 
         with open(commit_msg, 'w') as f:
             f.write(commit_msg_success)
@@ -122,7 +121,7 @@ exit 1
             f.write(post_commit_msg_fail)
         os.chmod(post_commit, stat.S_IREAD | stat.S_IWRITE | stat.S_IEXEC)
 
-        self.assertRaises(errors.HookError, hook.execute)
+        self.assertRaises(HookError, hook.execute)
 
         with open(post_commit, 'w') as f:
             f.write(post_commit_msg)

dulwich/tests/test_object_store.py

@@ -30,10 +30,8 @@ import tempfile
 from dulwich.index import (
     commit_tree,
     )
-from dulwich.errors import (
-    NotTreeError,
-    )
 from dulwich.objects import (
+    NotTreeError,
     sha_to_hex,
     Blob,
     Tree,

dulwich/tests/test_objects.py

@@ -33,10 +33,8 @@ import stat
 import warnings
 from contextlib import contextmanager
 
-from dulwich.errors import (
-    ObjectFormatException,
-    )
 from dulwich.objects import (
+    ObjectFormatException,
     Blob,
     Tree,
     Commit,

dulwich/tests/test_pack.py

@@ -29,10 +29,6 @@ import shutil
 import tempfile
 import zlib
 
-from dulwich.errors import (
-    ApplyDeltaError,
-    ChecksumMismatch,
-    )
 from dulwich.file import (
     GitFile,
     )
@@ -40,6 +36,7 @@ from dulwich.object_store import (
     MemoryObjectStore,
     )
 from dulwich.objects import (
+    ChecksumMismatch,
     hex_to_sha,
     sha_to_hex,
     Commit,
@@ -47,6 +44,7 @@ from dulwich.objects import (
     Blob,
     )
 from dulwich.pack import (
+    ApplyDeltaError,
     OFS_DELTA,
     REF_DELTA,
     MemoryPackIndex,

dulwich/tests/test_protocol.py

@@ -23,10 +23,8 @@
 
 from io import BytesIO
 
-from dulwich.errors import (
-    HangupException,
-    )
 from dulwich.protocol import (
+    HangupException,
     GitProtocolError,
     PktLineParser,
     Protocol,

dulwich/tests/test_refs.py

@@ -26,12 +26,13 @@ import os
 import sys
 import tempfile
 
-from dulwich import errors
 from dulwich.file import (
     GitFile,
     )
 from dulwich.objects import ZERO_SHA
 from dulwich.refs import (
+    PackedRefsException,
+    RefFormatError,
     DictRefsContainer,
     InfoRefsContainer,
     check_ref_format,
@@ -88,11 +89,11 @@ FOURS = b'4' * 40
 class PackedRefsFileTests(TestCase):
 
     def test_split_ref_line_errors(self):
-        self.assertRaises(errors.PackedRefsException, _split_ref_line,
+        self.assertRaises(PackedRefsException, _split_ref_line,
                           b'singlefield')
-        self.assertRaises(errors.PackedRefsException, _split_ref_line,
+        self.assertRaises(PackedRefsException, _split_ref_line,
                           b'badsha name')
-        self.assertRaises(errors.PackedRefsException, _split_ref_line,
+        self.assertRaises(PackedRefsException, _split_ref_line,
                           ONES + b' bad/../refname')
 
     def test_read_without_peeled(self):
@@ -107,7 +108,7 @@ class PackedRefsFileTests(TestCase):
         f = BytesIO(b'\n'.join([
             ONES + b' ref/1',
             b'^' + TWOS]))
-        self.assertRaises(errors.PackedRefsException, list,
+        self.assertRaises(PackedRefsException, list,
                           read_packed_refs(f))
 
     def test_read_with_peeled(self):
@@ -126,14 +127,14 @@ class PackedRefsFileTests(TestCase):
         f = BytesIO(b'\n'.join([
             b'^' + TWOS,
             ONES + b' ref/1']))
-        self.assertRaises(errors.PackedRefsException, list,
+        self.assertRaises(PackedRefsException, list,
                           read_packed_refs(f))
 
         f = BytesIO(b'\n'.join([
                 ONES + b' ref/1',
                 b'^' + TWOS,
                 b'^' + THREES]))
-        self.assertRaises(errors.PackedRefsException, list,
+        self.assertRaises(PackedRefsException, list,
                           read_packed_refs(f))
 
     def test_write_with_peeled(self):
@@ -194,7 +195,7 @@ class RefsContainerTests(object):
         self.assertEqual(b'42d06bd4b77fed026b154d16493e5deab78f02ec',
                          self._refs[b'refs/some/ref'])
         self.assertRaises(
-            errors.RefFormatError, self._refs.__setitem__,
+            RefFormatError, self._refs.__setitem__,
             b'notrefs/foo', b'42d06bd4b77fed026b154d16493e5deab78f02ec')
 
     def test_set_if_equals(self):
@@ -250,9 +251,9 @@ class RefsContainerTests(object):
         self._refs._check_refname(b'refs/stash')
         self._refs._check_refname(b'refs/heads/foo')
 
-        self.assertRaises(errors.RefFormatError, self._refs._check_refname,
+        self.assertRaises(RefFormatError, self._refs._check_refname,
                           b'refs')
-        self.assertRaises(errors.RefFormatError, self._refs._check_refname,
+        self.assertRaises(RefFormatError, self._refs._check_refname,
                           b'notrefs/foo')
 
     def test_contains(self):

dulwich/tests/test_repository.py

@@ -29,14 +29,14 @@ import sys
 import tempfile
 import warnings
 
-from dulwich import errors
 from dulwich.object_store import (
     tree_lookup_path,
     )
 from dulwich import objects
 from dulwich.config import Config
-from dulwich.errors import NotGitRepository
 from dulwich.repo import (
+    CommitError,
+    NotGitRepository,
     Repo,
     MemoryRepo,
     )
@@ -436,7 +436,7 @@ exit 0
             f.write(pre_commit_fail)
         os.chmod(pre_commit, stat.S_IREAD | stat.S_IWRITE | stat.S_IEXEC)
 
-        self.assertRaises(errors.CommitError, r.do_commit, 'failed commit',
+        self.assertRaises(CommitError, r.do_commit, 'failed commit',
                           committer='Test Committer <test@nodomain.com>',
                           author='Test Author <test@nodomain.com>',
                           commit_timestamp=12345, commit_timezone=0,
@@ -477,7 +477,7 @@ exit 0
             f.write(commit_msg_fail)
         os.chmod(commit_msg, stat.S_IREAD | stat.S_IWRITE | stat.S_IEXEC)
 
-        self.assertRaises(errors.CommitError, r.do_commit, b'failed commit',
+        self.assertRaises(CommitError, r.do_commit, b'failed commit',
                           committer=b'Test Committer <test@nodomain.com>',
                           author=b'Test Author <test@nodomain.com>',
                           commit_timestamp=12345, commit_timezone=0,
@@ -767,7 +767,7 @@ class BuildRepoRootTests(TestCase):
         r.refs.add_if_new = add_if_new
 
         old_shas = set(r.object_store)
-        self.assertRaises(errors.CommitError, r.do_commit, b'failed commit',
+        self.assertRaises(CommitError, r.do_commit, b'failed commit',
                           committer=b'Test Committer <test@nodomain.com>',
                           author=b'Test Author <test@nodomain.com>',
                           commit_timestamp=12345, commit_timezone=0,

dulwich/tests/test_server.py

@@ -27,17 +27,17 @@ import tempfile
 
 import sys
 
-from dulwich.errors import (
+from dulwich.object_store import (
+    MemoryObjectStore,
+    )
+from dulwich.protocol import (
     GitProtocolError,
-    NotGitRepository,
     UnexpectedCommandError,
     HangupException,
     )
-from dulwich.object_store import (
-    MemoryObjectStore,
-    )
 from dulwich.repo import (
     MemoryRepo,
+    NotGitRepository,
     Repo,
     )
 from dulwich.server import (

dulwich/tests/test_walk.py

@@ -30,9 +30,6 @@ from dulwich.diff_tree import (
     TreeChange,
     RenameDetector,
     )
-from dulwich.errors import (
-    MissingCommitError,
-    )
 from dulwich.object_store import (
     MemoryObjectStore,
     )
@@ -41,6 +38,7 @@ from dulwich.objects import (
     Blob,
     )
 from dulwich.walk import (
+    MissingCommitError,
     ORDER_TOPO,
     WalkEntry,
     Walker,