Fix Python 2

dulwich/porcelain.py

@@ -141,25 +141,25 @@ GitStatus = namedtuple('GitStatus', 'staged unstaged untracked')
 
 class NoneStream(RawIOBase):
     """Fallback if stdout or stderr are unavailable, does nothing."""
-    def read(size=-1):
+    def read(self, size=-1):
         return None
 
-    def readall():
+    def readall(self):
         return None
 
-    def readinto(b):
+    def readinto(self, b):
         return None
 
-    def write(b):
+    def write(self, b):
         return None
 
 
 default_bytes_out_stream = getattr(
         sys.stdout, 'buffer', sys.stdout
-    ) or NoneStream
+    ) or NoneStream()
 default_bytes_err_stream = getattr(
         sys.stderr, 'buffer', sys.stderr
-    ) or NoneStream
+    ) or NoneStream()
 
 
 DEFAULT_ENCODING = 'utf-8'

dulwich/tests/test_porcelain.py

@@ -233,7 +233,7 @@ class CloneTests(PorcelainTestCase):
         self.repo.refs[b"refs/heads/master"] = c1.id
         target_path = tempfile.mkdtemp()
         self.addCleanup(shutil.rmtree, target_path)
-        errstream = porcelain.NoneStream
+        errstream = porcelain.NoneStream()
         r = porcelain.clone(
             self.repo.path, target_path, checkout=True, errstream=errstream)
         r.close()