Python: replace requests2 with requests tree-wide

See f63eb58573

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

pkgs/development/python-modules/coveralls/default.nix

@@ -6,7 +6,7 @@
 , sh
 , coverage
 , docopt
-, requests2
+, requests
 , git
 }:
 
@@ -38,7 +38,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     coverage
     docopt
-    requests2
+    requests
   ];
 
   meta = {

pkgs/development/python-modules/docker.nix

@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchurl
-, six, requests2, websocket_client
+, six, requests, websocket_client
 , ipaddress, backports_ssl_match_hostname, docker_pycreds
 }:
 buildPythonPackage rec {
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     six
-    requests2
+    requests
     websocket_client
     ipaddress
     backports_ssl_match_hostname

pkgs/development/python-modules/docker_compose.nix

@@ -1,7 +1,7 @@
 { stdenv, buildPythonApplication, fetchurl, pythonOlder
 , mock, pytest, nose
 , pyyaml, backports_ssl_match_hostname, colorama, docopt
-, dockerpty, docker, ipaddress, jsonschema, requests2
+, dockerpty, docker, ipaddress, jsonschema, requests
 , six, texttable, websocket_client, cached-property
 , enum34, functools32
 }:
@@ -19,7 +19,7 @@ buildPythonApplication rec {
   buildInputs = [ mock pytest nose ];
   propagatedBuildInputs = [
     pyyaml backports_ssl_match_hostname colorama dockerpty docker
-    ipaddress jsonschema requests2 six texttable websocket_client
+    ipaddress jsonschema requests six texttable websocket_client
     docopt cached-property
   ] ++
     stdenv.lib.optional (pythonOlder "3.4") enum34 ++

pkgs/development/python-modules/ipython/5.nix

@@ -17,7 +17,7 @@
 , decorator
 , pathlib2
 , pickleshare
-, requests2
+, requests
 , simplegeneric
 , traitlets
 , prompt_toolkit
@@ -45,7 +45,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit
-    simplegeneric traitlets requests2 pathlib2 pexpect
+    simplegeneric traitlets requests pathlib2 pexpect
   ] ++ lib.optionals stdenv.isDarwin [ appnope ];
 
   LC_ALL="en_US.UTF-8";

pkgs/development/python-modules/notebook/default.nix

@@ -15,7 +15,7 @@
 , nbconvert
 , ipykernel
 , terminado
-, requests2
+, requests
 , pexpect
 }:
 
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   buildInputs = [nose glibcLocales]  ++ lib.optionals isPy27 [mock];
 
   propagatedBuildInputs = [jinja2 tornado ipython_genutils traitlets jupyter_core
-    jupyter_client nbformat nbconvert ipykernel terminado requests2 pexpect ];
+    jupyter_client nbformat nbconvert ipykernel terminado requests pexpect ];
 
   checkPhase = ''
     nosetests -v

pkgs/development/python-modules/plotly/default.nix

@@ -4,7 +4,7 @@
 , decorator
 , nbformat
 , pytz
-, requests2
+, requests
 , six
 }:
 
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     decorator
     nbformat
     pytz
-    requests2
+    requests
     six
   ];
 

pkgs/development/python-modules/pyrax.nix

@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchurl, requests2, novaclient, keyring,
+{ lib, buildPythonPackage, fetchurl, requests, novaclient, keyring,
   rackspace-novaclient, six, isPy3k, pytest, glibcLocales }:
 buildPythonPackage rec {
   name = "pyrax-1.9.8";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     '';
 
   disabled = isPy3k;
-  propagatedBuildInputs = [ requests2 novaclient keyring rackspace-novaclient six ];
+  propagatedBuildInputs = [ requests novaclient keyring rackspace-novaclient six ];
 
   LC_ALL = "en_US.UTF-8";
   buildInputs = [ pytest glibcLocales ];

pkgs/development/python-modules/pytest-httpbin/default.nix

@@ -6,7 +6,7 @@
 , decorator
 , httpbin
 , six
-, requests2
+, requests
 }:
 
 buildPythonPackage rec {
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   '';
 
   buildInputs = [ pytest ];
-  propagatedBuildInputs = [ flask decorator httpbin six requests2 ];
+  propagatedBuildInputs = [ flask decorator httpbin six requests ];
 
   meta = {
     description = "Easily test your HTTP library against a local copy of httpbin.org";

pkgs/development/python-modules/rackspace-novaclient.nix

@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchurl, isPy3k, requests2, novaclient, six, lib }:
+{ buildPythonPackage, fetchurl, isPy3k, requests, novaclient, six, lib }:
 let
 os-virtual-interfacesv2-python-novaclient-ext = buildPythonPackage rec {
   name = "os_virtual_interfacesv2_python_novaclient_ext-0.20";
@@ -129,7 +129,7 @@ buildPythonPackage rec {
 
   disabled = isPy3k;
   propagatedBuildInputs = [
-    requests2
+    requests
     novaclient
     six
     # extensions

pkgs/development/python-modules/requests-oauthlib.nix

@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchurl
-, oauthlib, requests2 }:
+, oauthlib, requests }:
 
 buildPythonPackage rec {
   version = "0.7.0";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
   };
 
   doCheck = false;        # Internet tests fail when building in chroot
-  propagatedBuildInputs = [ oauthlib requests2 ];
+  propagatedBuildInputs = [ oauthlib requests ];
 
   meta = with stdenv.lib; {
     description = "OAuthlib authentication support for Requests";

pkgs/development/python-modules/treq/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, service-identity, requests2,
+{ stdenv, fetchurl, buildPythonPackage, service-identity, requests,
   six, mock, twisted, incremental, coreutils, gnumake, pep8, sphinx,
   openssl, pyopenssl }:
 
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     service-identity
-    requests2
+    requests
     twisted
     incremental
     sphinx