From f7fc606b62e7e1c6658a7742d20f3ad7f26d848e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 11 Nov 2018 14:47:25 +0100
Subject: [PATCH] python: httpretty: 0.9.5 -> 0.9.6

---
 .../python-modules/httpretty/default.nix      | 21 +++----------------
 .../python-modules/httpretty/setup.py.patch   | 11 ----------
 2 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/development/python-modules/httpretty/setup.py.patch

diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix
index a44b8817483..1dcb7c14d99 100644
--- a/pkgs/development/python-modules/httpretty/default.nix
+++ b/pkgs/development/python-modules/httpretty/default.nix
@@ -14,32 +14,17 @@
 
 buildPythonPackage rec {
   pname = "httpretty";
-  version = "0.9.5";
+  version = "0.9.6";
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "543fa2bd9c319bfa1e1de9e37d7c9c08fa926a692b65b0be5df4b2f069fd0ad7";
+    sha256 = "01b52d45077e702eda491f4fe75328d3468fd886aed5dcc530003e7b2b5939dc";
   };
 
-  buildInputs = [ tornado requests httplib2 sure nose coverage certifi ];
+  checkInputs = [ tornado requests httplib2 sure nose coverage certifi ];
   propagatedBuildInputs = [ urllib3 ];
 
-  postPatch = ''
-    sed -i -e 's/==.*$//' *requirements.txt
-    # XXX: Drop this after version 0.8.4 is released.
-    patch httpretty/core.py <<DIFF
-    ***************
-    *** 566 ****
-    !                 'content-length': len(self.body)
-    --- 566 ----
-    !                 'content-length': str(len(self.body))
-    DIFF
-
-    # Explicit encoding flag is required with python3, unless locale is set.
-    ${if !isPy3k then "" else
-      "patch -p0 -i ${./setup.py.patch}"}
-  '';
 
   meta = with stdenv.lib; {
     homepage = "https://falcao.it/HTTPretty/";
diff --git a/pkgs/development/python-modules/httpretty/setup.py.patch b/pkgs/development/python-modules/httpretty/setup.py.patch
deleted file mode 100644
index e07ba931705..00000000000
--- a/pkgs/development/python-modules/httpretty/setup.py.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py    2016-04-18 10:44:27.915536022 -0500
-+++ setup-new.py           2016-04-18 10:44:13.515537377 -0500
-@@ -75,7 +75,7 @@
-
-
- local_file = lambda *f: \
--    open(os.path.join(os.path.dirname(__file__), *f)).read()
-+    open(os.path.join(os.path.dirname(__file__), *f), encoding="utf-8").read()
-
-
- install_requires, dependency_links = \