Refresh patches.

debian/patches/01_no_urllib3_pypy

@@ -1,7 +1,9 @@
 === modified file 'dulwich/tests/compat/test_client.py'
---- old/dulwich/tests/compat/test_client.py	2018-11-05 19:27:24 +0000
-+++ new/dulwich/tests/compat/test_client.py	2018-11-17 19:32:09 +0000
-@@ -544,6 +544,8 @@
+Index: dulwich/dulwich/tests/compat/test_client.py
+===================================================================
+--- dulwich.orig/dulwich/tests/compat/test_client.py
++++ dulwich/dulwich/tests/compat/test_client.py
+@@ -544,6 +544,8 @@ class DulwichHttpClientTest(CompatTestCa
      min_git_version = (1, 7, 0, 2)
  
      def setUp(self):
@@ -10,11 +12,11 @@
          CompatTestCase.setUp(self)
          DulwichClientTestBase.setUp(self)
          self._httpd = HTTPGitServer(("localhost", 0), self.gitroot)
-
-=== modified file 'dulwich/tests/test_client.py'
---- old/dulwich/tests/test_client.py	2018-11-17 19:26:16 +0000
-+++ new/dulwich/tests/test_client.py	2018-11-17 19:32:27 +0000
-@@ -35,7 +35,8 @@
+Index: dulwich/dulwich/tests/test_client.py
+===================================================================
+--- dulwich.orig/dulwich/tests/test_client.py
++++ dulwich/dulwich/tests/test_client.py
+@@ -35,7 +35,8 @@ try:
  except ImportError:
      import urllib.parse as urlparse
  
@@ -24,7 +26,7 @@
  
  import dulwich
  from dulwich import (
-@@ -550,12 +551,20 @@
+@@ -551,12 +552,20 @@ class TestGetTransportAndPath(TestCase):
          self.assertTrue(isinstance(c, SSHGitClient))
  
      def test_http(self):
@@ -45,7 +47,7 @@
          url = 'https://user:passwd@github.com/jelmer/dulwich'
  
          c, path = get_transport_and_path(url)
-@@ -566,6 +575,9 @@
+@@ -567,6 +576,9 @@ class TestGetTransportAndPath(TestCase):
          self.assertEqual('passwd', c._password)
  
      def test_http_auth_with_username(self):
@@ -55,7 +57,7 @@
          url = 'https://github.com/jelmer/dulwich'
  
          c, path = get_transport_and_path(
-@@ -577,6 +589,9 @@
+@@ -578,6 +590,9 @@ class TestGetTransportAndPath(TestCase):
          self.assertEqual('blah', c._password)
  
      def test_http_auth_with_username_and_in_url(self):
@@ -65,7 +67,7 @@
          url = 'https://user:passwd@github.com/jelmer/dulwich'
  
          c, path = get_transport_and_path(
-@@ -588,6 +603,10 @@
+@@ -589,6 +604,10 @@ class TestGetTransportAndPath(TestCase):
          self.assertEqual('passwd', c._password)
  
      def test_http_no_auth(self):
@@ -76,7 +78,7 @@
          url = 'https://github.com/jelmer/dulwich'
  
          c, path = get_transport_and_path(url)
-@@ -670,6 +689,9 @@
+@@ -671,6 +690,9 @@ class TestGetTransportAndPathFromUrl(Tes
              'prospero://bar/baz')
  
      def test_http(self):
@@ -86,7 +88,7 @@
          url = 'https://github.com/jelmer/dulwich'
          c, path = get_transport_and_path_from_url(url)
          self.assertTrue(isinstance(c, HttpGitClient))
-@@ -677,6 +699,9 @@
+@@ -678,6 +700,9 @@ class TestGetTransportAndPathFromUrl(Tes
          self.assertEqual('/jelmer/dulwich', path)
  
      def test_http_port(self):
@@ -96,7 +98,7 @@
          url = 'https://github.com:9090/jelmer/dulwich'
          c, path = get_transport_and_path_from_url(url)
          self.assertEqual('https://github.com:9090', c.get_url(b'/'))
-@@ -909,6 +934,11 @@
+@@ -910,6 +935,11 @@ class LocalGitClientTests(TestCase):
  
  class HttpGitClientTests(TestCase):
  
@@ -108,7 +110,7 @@
      @staticmethod
      def b64encode(s):
          """Python 2/3 compatible Base64 encoder. Returns string."""
-@@ -1007,12 +1037,18 @@
+@@ -1088,12 +1118,18 @@ class TCPGitClientTests(TestCase):
  
  class DefaultUrllib3ManagerTest(TestCase):
  
@@ -127,4 +129,3 @@
          manager = default_urllib3_manager(config=ConfigDict())
          self.assertNotIsInstance(manager, urllib3.ProxyManager)
  
-

debian/patches/02_skip_flappy_test

@@ -1,7 +1,9 @@
 === modified file 'dulwich/tests/test_porcelain.py'
---- old/dulwich/tests/test_porcelain.py	2018-11-05 19:27:24 +0000
-+++ new/dulwich/tests/test_porcelain.py	2018-11-20 04:03:18 +0000
-@@ -693,6 +693,9 @@
+Index: dulwich/dulwich/tests/test_porcelain.py
+===================================================================
+--- dulwich.orig/dulwich/tests/test_porcelain.py
++++ dulwich/dulwich/tests/test_porcelain.py
+@@ -941,6 +941,9 @@ class PushTests(PorcelainTestCase):
          clone the remote, commit a file to the clone, then push the changes
          back to the remote.
          """
@@ -11,4 +13,3 @@
          outstream = BytesIO()
          errstream = BytesIO()
  
-

debian/patches/03_default_identity

@@ -1,20 +0,0 @@
-diff --git a/dulwich/repo.py b/dulwich/repo.py
-index 7ebeec8e..ddedb7ac 100644
---- a/dulwich/repo.py
-+++ b/dulwich/repo.py
-@@ -168,9 +168,13 @@ def get_user_identity(config, kind=None):
-             email = None
-     default_user, default_email = _get_default_identity()
-     if user is None:
--        user = default_user.encode('utf-8')
-+        user = default_user
-+        if not isinstance(user, bytes):
-+            user = user.encode('utf-8')
-     if email is None:
--        email = default_email.encode('utf-8')
-+        email = default_email
-+        if not isinstance(email, bytes):
-+            email = email.encode('utf-8')
-     return (user + b" <" + email + b">")
- 
- 

debian/patches/series

@@ -1,3 +1,2 @@
 01_no_urllib3_pypy
 02_skip_flappy_test
-03_default_identity