Fix tests on older versions of Python 3.

diff --git a/dulwich/client.py b/dulwich/client.py
index 3d8646827e5a5da62fda8446104523ad6678dfe8..ed1a2d96a82b8f4733f25b35c467c06909a8c1b8 100644 (file)
--- a/dulwich/client.py
+++ b/dulwich/client.py
@@ -599,7 +599,8 @@ class GitClient(object):
                     "depth")
             for sha in graph_walker.shallow:
                 proto.write_pkt_line(COMMAND_SHALLOW + b' ' + sha + b'\n')
-            proto.write_pkt_line(b'%s %d\n' % (COMMAND_DEEPEN, depth))
+            proto.write_pkt_line(COMMAND_DEEPEN + b' ' +
+                                 str(depth).encode('ascii') + b'\n')
             proto.write_pkt_line(None)
             if can_read is not None:
                 (new_shallow, new_unshallow) = _read_shallow_updates(proto)

diff --git a/dulwich/refs.py b/dulwich/refs.py
index 89c4cfdbb79ebeea87d694d14b0ea3f8836d3da4..7c44bd5f9865309f1664757b2f983468597bf3d4 100644 (file)
--- a/dulwich/refs.py
+++ b/dulwich/refs.py
@@ -800,7 +800,7 @@ class DiskRefsContainer(RefsContainer):
             parent_filename = self.refpath(parent)
             try:
                 os.rmdir(parent_filename)
-            except OSError as e:
+            except OSError:
                 # this can be caused by the parent directory being
                 # removed by another process, being not empty, etc.
                 # in any case, this is non fatal because we already

diff --git a/dulwich/server.py b/dulwich/server.py
index ddd01c91f2f16b5eb7af22ddcc46fccff52bd9db..6b77575e9b20a3901d8808696118e39c2e0c2a82 100644 (file)
--- a/dulwich/server.py
+++ b/dulwich/server.py
@@ -927,7 +927,7 @@ class ReceivePackHandler(PackHandler):
                         self.repo.refs.set_if_equals(ref, oldsha, sha)
                     except all_exceptions:
                         ref_status = b'failed to write'
-            except KeyError as e:
+            except KeyError:
                 ref_status = b'bad ref'
             status.append((ref, ref_status))