Python: replace requests2 with requests tree-wide

See f63eb58573

The `requests2` attribute now throws an error informing that `requests`
should be used instead.

pkgs/tools/networking/dd-agent/default.nix

@@ -15,7 +15,7 @@ let
 
     propagatedBuildInputs = with pythonPackages; [
       six
-      requests2
+      requests
       websocket_client
       ipaddress
       backports_ssl_match_hostname
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
     python
     unzip
     makeWrapper
-    pythonPackages.requests2
+    pythonPackages.requests
     pythonPackages.psycopg2
     pythonPackages.psutil
     pythonPackages.ntplib

pkgs/tools/networking/httpie/default.nix

@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "1jsgfkyzzizgfy1b0aicb4cp34d5pwskz9c4a8kf4rq3lrpjw87i";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ pygments requests2 ];
+  propagatedBuildInputs = with pythonPackages; [ pygments requests ];
 
   doCheck = false;
 

pkgs/tools/networking/linkchecker/default.nix

@@ -5,7 +5,7 @@ python2Packages.buildPythonApplication rec {
   version = "9.3";
 
   buildInputs = with python2Packages ; [ pytest ];
-  propagatedBuildInputs = with python2Packages ; [ requests2 ] ++ [ gettext ];
+  propagatedBuildInputs = with python2Packages ; [ requests ] ++ [ gettext ];
 
   src = fetchurl {
     url = "mirror://pypi/L/LinkChecker/${name}.tar.gz";
@@ -13,7 +13,7 @@ python2Packages.buildPythonApplication rec {
   };
 
   # 1. upstream refuses to support ignoring robots.txt
-  # 2. work around requests2 version detection - can be dropped >v9.3
+  # 2. work around requests version detection - can be dropped >v9.3
   patches = [
     ./add-no-robots-flag.patch
     ./no-version-check.patch

pkgs/tools/networking/mitmproxy/default.nix

@@ -16,7 +16,7 @@ python3Packages.buildPythonPackage rec {
     blinker click certifi construct cryptography
     cssutils editorconfig h2 html2text hyperframe
     jsbeautifier kaitaistruct passlib pyasn1 pyopenssl
-    pyparsing pyperclip requests2 ruamel_yaml tornado
+    pyparsing pyperclip requests ruamel_yaml tornado
     urwid watchdog brotlipy sortedcontainers
   ];
 

pkgs/tools/networking/urlwatch/default.nix

@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
     keyring
     minidb
     pyyaml
-    requests2
+    requests
   ];
 
   meta = with stdenv.lib; {