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/audio/beets/default.nix

@@ -100,7 +100,7 @@ in pythonPackages.buildPythonApplication rec {
     ++ optional (enableFetchart
               || enableEmbyupdate
               || enableAcousticbrainz)
-                                   pythonPackages.requests2
+                                   pythonPackages.requests
     ++ optional enableConvert      ffmpeg
     ++ optional enableDiscogs      pythonPackages.discogs_client
     ++ optional enableKeyfinder    keyfinder-cli

pkgs/tools/backup/s3ql/default.nix

@@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec {
 
   buildInputs = [ which ]; # tests will fail without which
   propagatedBuildInputs = with python3Packages; [
-    sqlite apsw pycrypto requests2 defusedxml dugong llfuse
+    sqlite apsw pycrypto requests defusedxml dugong llfuse
     cython pytest pytest-catchlog
   ];
 

pkgs/tools/misc/asciinema/default.nix

@@ -7,7 +7,7 @@ in pythonPackages.buildPythonApplication rec {
   version = "1.4.0";
 
   buildInputs = with pythonPackages; [ nose ];
-  propagatedBuildInputs = with pythonPackages; [ requests2 ];
+  propagatedBuildInputs = with pythonPackages; [ requests ];
 
   src = fetchFromGitHub {
     owner = "asciinema";

pkgs/tools/misc/kargo/default.nix

@@ -20,7 +20,7 @@ python2Packages.buildPythonApplication rec {
     markupsafe
     netaddr
     pyasn1
-    requests2
+    requests
     setuptools
   ];
 

pkgs/tools/misc/svtplay-dl/default.nix

@@ -2,7 +2,7 @@
 , rtmpdump, substituteAll }:
 
 let
-  inherit (pythonPackages) python nose pycrypto requests2 mock;
+  inherit (pythonPackages) python nose pycrypto requests mock;
 in stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
   version = "1.9.3";
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
     sha256 = "14qksi1svi89niffykxg47kay013byls6bnhkrkzkanq04075lmw";
   };
 
-  pythonPaths = [ pycrypto requests2 ];
+  pythonPaths = [ pycrypto requests ];
   buildInputs = [ python perl nose mock rtmpdump makeWrapper ] ++ pythonPaths;
   nativeBuildInputs = [ zip ];
 

pkgs/tools/misc/system-config-printer/default.nix

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ wrapGAppsHook ];
 
   pythonPath = with pythonPackages;
-    [ pycups pycurl dbus-python pygobject3 requests2 pycairo pythonPackages.pycurl ];
+    [ pycups pycurl dbus-python pygobject3 requests pycairo pythonPackages.pycurl ];
 
   configureFlags =
     [ "--with-udev-rules"

pkgs/tools/misc/vdirsyncer/default.nix

@@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec {
   propagatedBuildInputs = with pythonPackages; [
     click click-log click-threading
     requests_toolbelt
-    requests2
+    requests
     atomicwrites
   ];
 

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; {

pkgs/tools/package-management/nox/default.nix

@@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {
   propagatedBuildInputs = with pythonPackages; [
       dogpile_cache
       click
-      requests2
+      requests
       characteristic
     ];
 

pkgs/tools/security/vulnix/default.nix

@@ -27,7 +27,7 @@ in pythonPackages.buildPythonApplication rec{
     colorama
     lxml
     pyyaml
-    requests2
+    requests
     external.zodb
   ]);