Python: replace requests2 with requests tree-wide

See f63eb58573 The `requests2` attribute now throws an error informing that `requests` should be used instead.
6 years ago · ef4442e827
parent 024ddb32a7
commit ef4442e827
51 changed files with 170 additions and 169 deletions
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@ -580,7 +580,7 @@ running `nix-shell` with the following `shell.nix`
 with import <nixpkgs> {};

 (python3.buildEnv.override {
-  extraLibs = with python3Packages; [ numpy requests2 ];
+  extraLibs = with python3Packages; [ numpy requests ];
 }).env
 ```

@ -622,7 +622,7 @@ attribute. The `shell.nix` file from the previous section can thus be also writt
 ```nix
 with import <nixpkgs> {};

-(python33.withPackages (ps: [ps.numpy ps.requests2])).env
+(python33.withPackages (ps: [ps.numpy ps.requests])).env
 ```

 In contrast to `python.buildEnv`, `python.withPackages` does not support the more advanced options
--- a/pkgs/applications/audio/mopidy-gmusic/default.nix
+++ b/pkgs/applications/audio/mopidy-gmusic/default.nix
@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {

  propagatedBuildInputs = [
    mopidy
-    pythonPackages.requests2
+    pythonPackages.requests
    pythonPackages.gmusicapi
    pythonPackages.cachetools
  ];
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@ -22,7 +22,7 @@ pythonPackages.buildPythonApplication rec {
  ];

  propagatedBuildInputs = with pythonPackages; [
-    gst-python pygobject3 pykka tornado requests2 dbus-python
+    gst-python pygobject3 pykka tornado requests dbus-python
  ];

  # There are no tests
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
    fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++
    (stdenv.lib.optional withGrass grass) ++
-    (with python2Packages; [ numpy psycopg2 requests2 python2Packages.qscintilla sip ]);
+    (with python2Packages; [ numpy psycopg2 requests python2Packages.qscintilla sip ]);

  nativeBuildInputs = [ cmake makeWrapper ];

--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@ -15,7 +15,7 @@ with pythonPackages; buildPythonApplication rec {
  propagatedBuildInputs = [
    cryptography
    beautifulsoup4
-    requests2
+    requests
    urllib3
  ];

--- a/pkgs/applications/misc/haxor-news/default.nix
+++ b/pkgs/applications/misc/haxor-news/default.nix
@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
  propagatedBuildInputs = with pythonPackages; [
    click
    colorama
-    requests2
+    requests
    pygments
    prompt_toolkit
    six
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@ -65,7 +65,7 @@ in pythonPackages.buildPythonApplication rec {

  # We need old Tornado
  propagatedBuildInputs = with pythonPackages; [
-    awesome-slugify flask_assets rsa requests2 pkginfo watchdog
+    awesome-slugify flask_assets rsa requests pkginfo watchdog
    semantic-version flask_principal werkzeug flaskbabel tornado
    psutil pyserial flask_login netaddr markdown sockjs-tornado
    pylru pyyaml sarge feedparser netifaces click websocket_client
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@ -35,7 +35,7 @@ buildPythonApplication rec {
    kitchen
    mailcap-fix
    mccabe
-    requests2
+    requests
    six
    tornado
    pyyaml
--- a/pkgs/applications/misc/toot/default.nix
+++ b/pkgs/applications/misc/toot/default.nix
@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
  };

  propagatedBuildInputs = with pythonPackages;
-    [ requests2 beautifulsoup4 future ];
+    [ requests beautifulsoup4 future ];

  meta = with stdenv.lib; {
    description = "Mastodon CLI interface";
--- a/pkgs/applications/networking/errbot/default.nix
+++ b/pkgs/applications/networking/errbot/default.nix
@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec {
  ];

  propagatedBuildInputs = with pythonPackages; [
-    webtest bottle threadpool rocket-errbot requests2 jinja2
+    webtest bottle threadpool rocket-errbot requests jinja2
    pyopenssl colorlog Yapsy markdown ansi pygments dns pep8
    daemonize pygments-markdown-lexer telegram irc slackclient
    pyside sleekxmpp hypchat pytest
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@ -41,7 +41,7 @@ buildPythonApplication rec {
  propagatedBuildInputs = [
    feedparser sqlalchemy pyyaml
    beautifulsoup4 html5lib PyRSS2Gen pynzb
-    rpyc jinja2 requests2 dateutil jsonschema
+    rpyc jinja2 requests dateutil jsonschema
    pathpy guessit APScheduler
    terminaltables colorclass
    cherrypy flask flask-restful flask-restplus_0_8
--- a/pkgs/applications/networking/sync/acd_cli/default.nix
+++ b/pkgs/applications/networking/sync/acd_cli/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, buildPythonApplication, fuse
-, appdirs, colorama, dateutil, requests2, requests_toolbelt
+, appdirs, colorama, dateutil, requests, requests_toolbelt
 , fusepy, sqlalchemy }:

 buildPythonApplication rec {
@ -16,7 +16,7 @@ buildPythonApplication rec {
    sha256 = "0a0fr632l24a3jmgla3b1vcm50ayfa9hdbp677ch1chwj5dq4zfp";
  };

-  propagatedBuildInputs = [ appdirs colorama dateutil fusepy requests2
+  propagatedBuildInputs = [ appdirs colorama dateutil fusepy requests
                            requests_toolbelt sqlalchemy ];

  makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${fuse}/lib/libfuse.so" ];
--- a/pkgs/applications/office/watson/default.nix
+++ b/pkgs/applications/office/watson/default.nix
@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec {
    py.test -vs tests
 '';
  checkInputs = with pythonPackages; [ py pytest pytest-datafiles mock pytest-mock pytestrunner ];
-  propagatedBuildInputs = with pythonPackages; [ requests2 click arrow ];
+  propagatedBuildInputs = with pythonPackages; [ requests click arrow ];

  meta = with stdenv.lib; {
    homepage = https://tailordev.github.io/Watson/;
--- a/pkgs/applications/version-management/git-review/default.nix
+++ b/pkgs/applications/version-management/git-review/default.nix
@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec {
    sha256 = "aa594690ed586041a524d6e5ae76152cbd53d4f03a98b20b213d15cecbe128ce";
  };

-  propagatedBuildInputs = [ pythonPackages.pbr pythonPackages.requests2 pythonPackages.argparse pythonPackages.setuptools ];
+  propagatedBuildInputs = [ pythonPackages.pbr pythonPackages.requests pythonPackages.argparse pythonPackages.setuptools ];

  # Don't do tests because they require gerrit which is not packaged
  doCheck = false;
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec {

  buildInputs = with pythonPackages; [ pytest mock ];

-  propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests2 iso-639 iso3166 ]) ++ [ rtmpdump ffmpeg ];
+  propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 ]) ++ [ rtmpdump ffmpeg ];

  meta = with stdenv.lib; {
    homepage = https://github.com/streamlink/streamlink;
--- a/pkgs/applications/virtualization/openstack/glance.nix
+++ b/pkgs/applications/virtualization/openstack/glance.nix
@ -26,7 +26,7 @@ python2Packages.buildPythonApplication rec {
  ];

  buildInputs = with python2Packages; [
-    Babel coverage fixtures mox3 mock oslosphinx requests2 testrepository pep8
+    Babel coverage fixtures mox3 mock oslosphinx requests testrepository pep8
    testresources testscenarios testtools psutil_1 oslotest psycopg2
    sqlite which strace
  ];
--- a/pkgs/applications/virtualization/openstack/keystone.nix
+++ b/pkgs/applications/virtualization/openstack/keystone.nix
@ -30,7 +30,7 @@ python2Packages.buildPythonApplication rec {

  buildInputs = with python2Packages; [
    coverage fixtures mock subunit tempest-lib testtools testrepository
-    ldap ldappool webtest requests2 oslotest pep8 pymongo which
+    ldap ldappool webtest requests oslotest pep8 pymongo which
  ];

  makeWrapperArgs = ["--prefix PATH : '${openssl.bin}/bin:$PATH'"];
--- a/pkgs/applications/virtualization/openstack/neutron.nix
+++ b/pkgs/applications/virtualization/openstack/neutron.nix
@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec {

  # https://github.com/openstack/neutron/blob/stable/liberty/requirements.txt
  propagatedBuildInputs = with python2Packages; [
-   pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests2
+   pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests
   jinja2 keystonemiddleware netaddr retrying sqlalchemy webob alembic six
   stevedore pecan ryu networking-hyperv MySQL_python

--- a/pkgs/applications/virtualization/openstack/nova.nix
+++ b/pkgs/applications/virtualization/openstack/nova.nix
@ -24,7 +24,7 @@ python2Packages.buildPythonApplication rec {
  propagatedBuildInputs = with python2Packages; [
    pbr sqlalchemy boto decorator eventlet jinja2 lxml routes cryptography
    webob greenlet PasteDeploy paste prettytable sqlalchemy_migrate netaddr
-    netifaces paramiko Babel iso8601 jsonschema keystoneclient requests2 six
+    netifaces paramiko Babel iso8601 jsonschema keystoneclient requests six
    stevedore websockify rfc3986 os-brick psutil_1 alembic psycopg2 pymysql
    keystonemiddleware MySQL_python

--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-music/default.nix
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
                  gdk_pixbuf gnome3.defaultIconTheme librsvg python3Packages.python
                  gnome3.grilo gnome3.grilo-plugins gnome3.totem-pl-parser libxml2 libnotify
-                  python3Packages.pycairo python3Packages.dbus-python python3Packages.requests2
+                  python3Packages.pycairo python3Packages.dbus-python python3Packages.requests
                  python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base
                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook
                  gnome3.gsettings_desktop_schemas makeWrapper tracker ];
--- a/pkgs/development/python-modules/coveralls/default.nix
+++ b/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 = {
--- a/pkgs/development/python-modules/docker.nix
+++ b/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
--- a/pkgs/development/python-modules/docker_compose.nix
+++ b/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 ++
--- a/pkgs/development/python-modules/ipython/5.nix
+++ b/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";
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/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
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/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
  ];

--- a/pkgs/development/python-modules/pyrax.nix
+++ b/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 ];
--- a/pkgs/development/python-modules/pytest-httpbin/default.nix
+++ b/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";
--- a/pkgs/development/python-modules/rackspace-novaclient.nix
+++ b/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
--- a/pkgs/development/python-modules/requests-oauthlib.nix
+++ b/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";
--- a/pkgs/development/python-modules/treq/default.nix
+++ b/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
--- a/pkgs/development/tools/backblaze-b2/default.nix
+++ b/pkgs/development/tools/backblaze-b2/default.nix
@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
    sha256 = "1gl1z7zg3s1xgx45i6b1bvx9iwviiiinl4my00h66qkhrw7ag8p1";
  };

-  propagatedBuildInputs = with pythonPackages; [ futures requests2 six tqdm ];
+  propagatedBuildInputs = with pythonPackages; [ futures requests six tqdm ];

  checkPhase = ''
    python test_b2_command_line.py test
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
  };

  propagatedBuildInputs = with pythonPackages; [
-    requests2 fasteners pyyaml pyjwt colorama patch
+    requests fasteners pyyaml pyjwt colorama patch
    bottle pluginbase six distro pylint node-semver
  ];

--- a/pkgs/servers/inginious/default.nix
+++ b/pkgs/servers/inginious/default.nix
@ -37,7 +37,7 @@ in pythonPackages.buildPythonApplication rec {
  '';

  propagatedBuildInputs = with pythonPackages; [
-    requests2
+    requests
    cgroup-utils docker_1_7_2 docutils PyLTI mock pygments
    pymongo pyyaml rpyc sh simpleldap sphinx_rtd_theme tidylib
    websocket_client watchdog webpy-custom flup
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@ -37,7 +37,7 @@ in pythonPackages.buildPythonApplication rec {

  propagatedBuildInputs = with pythonPackages; [
    blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1
-    pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests2
+    pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests
    signedjson systemd twisted ujson unpaddedbase64 pyyaml
    matrix-angular-sdk bleach netaddr jinja2 psycopg2
    psutil msgpack lxml matrix-synapse-ldap3
--- a/pkgs/tools/audio/beets/default.nix
+++ b/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
--- a/pkgs/tools/backup/s3ql/default.nix
+++ b/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
  ];

--- a/pkgs/tools/misc/asciinema/default.nix
+++ b/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";
--- a/pkgs/tools/misc/kargo/default.nix
+++ b/pkgs/tools/misc/kargo/default.nix
@ -20,7 +20,7 @@ python2Packages.buildPythonApplication rec {
    markupsafe
    netaddr
    pyasn1
-    requests2
+    requests
    setuptools
  ];

--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/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 ];

--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/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"
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/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
  ];

--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/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
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/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;

--- a/pkgs/tools/networking/linkchecker/default.nix
+++ b/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
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/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
  ];

--- a/pkgs/tools/networking/urlwatch/default.nix
+++ b/pkgs/tools/networking/urlwatch/default.nix
@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
    keyring
    minidb
    pyyaml
-    requests2
+    requests
  ];

  meta = with stdenv.lib; {
--- a/pkgs/tools/package-management/nox/default.nix
+++ b/pkgs/tools/package-management/nox/default.nix
@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {
  propagatedBuildInputs = with pythonPackages; [
      dogpile_cache
      click
-      requests2
+      requests
      characteristic
    ];

--- a/pkgs/tools/security/vulnix/default.nix
+++ b/pkgs/tools/security/vulnix/default.nix
@ -27,7 +27,7 @@ in pythonPackages.buildPythonApplication rec{
    colorama
    lxml
    pyyaml
-    requests2
+    requests
    external.zodb
  ]);

--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -12939,7 +12939,7 @@ with pkgs;
  acd-cli = callPackage ../applications/networking/sync/acd_cli {
    inherit (python35Packages)
      buildPythonApplication appdirs colorama dateutil
-      requests2 requests_toolbelt sqlalchemy fusepy;
+      requests requests_toolbelt sqlalchemy fusepy;
  };

  adobe-reader = callPackage_i686 ../applications/misc/adobe-reader { };
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -446,7 +446,7 @@ in {
    name = "acme-${version}";

    propagatedBuildInputs = with self; [
-      cryptography pyasn1 pyopenssl pyRFC3339 pytz requests2 six werkzeug mock
+      cryptography pyasn1 pyopenssl pyRFC3339 pytz requests six werkzeug mock
      ndg-httpsclient
    ];

@ -524,7 +524,7 @@ in {
      sha256 = "1f32k18ck54adqlgvh6fjhy4yavcyrwy813prjyqppqqq4bn1a09";
    };

-    propagatedBuildInputs = with self; [ requests2 pyjwt ];
+    propagatedBuildInputs = with self; [ requests pyjwt ];

    meta = {
      description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources";
@ -1613,7 +1613,7 @@ in {
      sha256 = "89c20b2efaaed3c6f56345d55c32a8d4e7d2a16c032d0acb92f8f490c508fe24";
    };

-    propagatedBuildInputs = with self; [ dateutil futures pyopenssl requests2 ];
+    propagatedBuildInputs = with self; [ dateutil futures pyopenssl requests ];

    meta = {
      description = "Microsoft Azure SDK for Python";
@ -1665,7 +1665,7 @@ in {
      url = mirror://pypi/a/azure-mgmt-common/azure-mgmt-common-0.20.0.zip;
      sha256 = "1rmzpz3733wv31rsnqpdy4bbafvk5dhbqx7q0xf62dlz7p0i4f66";
    };
-    propagatedBuildInputs = with self; [ azure-common azure-mgmt-nspkg requests2 ];
+    propagatedBuildInputs = with self; [ azure-common azure-mgmt-nspkg requests ];
    postInstall = ''
      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
@ -1801,7 +1801,7 @@ in {
      url = mirror://pypi/a/azure-storage/azure-storage-0.20.3.zip;
      sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb";
    };
-    propagatedBuildInputs = with self; [ azure-common futures dateutil requests2 ];
+    propagatedBuildInputs = with self; [ azure-common futures dateutil requests ];
    postInstall = ''
      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
    '';
@ -1820,7 +1820,7 @@ in {
      url = mirror://pypi/a/azure-servicemanagement-legacy/azure-servicemanagement-legacy-0.20.1.zip;
      sha256 = "17dwrp99sx5x9cm4vldkaxhki9gbd6dlafa0lpr2n92xhh2838zs";
    };
-    propagatedBuildInputs = with self; [ azure-common requests2 ];
+    propagatedBuildInputs = with self; [ azure-common requests ];
    postInstall = ''
      echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
    '';
@ -2090,7 +2090,7 @@ in {
      sha256 = "0vw4d53jbbb2kdl7l891h8iyxklqcd6ldvgcyhw9hl40ljdhv1wz";
    };

-    propagatedBuildInputs = [ self.requests2 ];
+    propagatedBuildInputs = [ self.requests ];

    doCheck = false;

@ -2523,7 +2523,7 @@ in {
    };

    buildInputs = with self; [ pillow tox mock six nose ];
-    propagatedBuildInputs = with self; [ requests2 decorator simplejson ];
+    propagatedBuildInputs = with self; [ requests decorator simplejson ];

    meta = {
      description = "The Datadog Python library ";
@ -2565,7 +2565,7 @@ in {
      sha256 = "1bkqhlzigy656pam0znp2ddp1y5sqzyhw3c4fyy58spcafldq4j6";
    };
    buildInputs = with self; [ pytest ];
-    propagatedBuildInputs = with self; [ requests2 lxml pbr ];
+    propagatedBuildInputs = with self; [ requests lxml pbr ];
    # prompt_toolkit doesn't work on 3.5 on OSX.
    doCheck = !isPy35;

@ -2609,7 +2609,7 @@ in {
      sha256 = "0fs7a4cf4f12mjhcjd5vfh0f3ixcy2nawzxpgsfr3ahf0rg7ppx5";
    };

-    propagatedBuildInputs = with self; [ cookies mock requests2 six ];
+    propagatedBuildInputs = with self; [ cookies mock requests six ];

    doCheck = false;

@ -2732,7 +2732,7 @@ in {
       sha256 = "d881e21ec7ebfa006cfca6d10a5b7229aa59990568f8c6b8e3364769fa38b6f6";
    };

-    propagatedBuildInputs = [ self.requests2 ];
+    propagatedBuildInputs = [ self.requests ];

    # No tests
    doCheck = false;
@ -2793,7 +2793,7 @@ in {
      psutil
      pymongo
      pyyaml
-      requests2
+      requests
      sqlalchemy
      tables
      toolz
@ -2983,7 +2983,7 @@ in {
      werkzeug
      itsdangerous
      dateutil
-      requests2
+      requests
      six
      pygments
      pystache
@ -3023,7 +3023,7 @@ in {
    '';

    buildInputs = [ self.nose self.mock ];
-    propagatedBuildInputs = [ self.requests2 self.httpretty ];
+    propagatedBuildInputs = [ self.requests self.httpretty ];

    meta = {
      homepage = https://github.com/boto/boto;
@ -3088,7 +3088,7 @@ in {

    propagatedBuildInputs =
      [ self.dateutil
-        self.requests2
+        self.requests
        self.jmespath
      ];

@ -3167,7 +3167,7 @@ in {

    buildInputs = with self; [ mock unittest2 nose /* jira megaplan */ ];
    propagatedBuildInputs = with self; [
-      twiggy requests2 offtrac bugzilla taskw dateutil pytz keyring six
+      twiggy requests offtrac bugzilla taskw dateutil pytz keyring six
      jinja2 pycurl dogpile_cache lockfile click pyxdg
    ];

@ -3213,7 +3213,7 @@ in {
    patches = [ ../development/python-modules/bugzilla/checkPhase-fix-cookie-compare.patch ];

    buildInputs = with self; [ pep8 coverage logilab_common ];
-    propagatedBuildInputs = [ self.requests2 ];
+    propagatedBuildInputs = [ self.requests ];

    preCheck = ''
      mkdir -p check-phase
@ -3257,7 +3257,7 @@ in {
      sha256 = "0l3a7iyk596x6pvzg7604lzzi012qszr804fqn6f517zcy1xz23j";
    };

-    propagatedBuildInputs = [ self.requests2 self.py ];
+    propagatedBuildInputs = [ self.requests self.py ];

    meta = {
      homepage = https://bitbucket.org/hpk42/devpi;
@ -3633,7 +3633,7 @@ in {
      sed -i 's/==/>=/' requirements.txt
    '';

-    propagatedBuildInputs = with self; [ docopt requests2 pygments ];
+    propagatedBuildInputs = with self; [ docopt requests pygments ];

    # Error when running tests:
    # No local packages or download links found for requests
@ -4103,7 +4103,7 @@ in {
      sha256 = "0vfyr499sbc4nnhhijp2lznyj507nnak95bvv9w8y78ngxggskbh";
    };

-    buildInputs = with self; [ requests2 six pytest ];
+    buildInputs = with self; [ requests six pytest ];

    # No tests distributed. https://github.com/cablehead/python-consul/issues/133
    doCheck = false;
@ -4403,7 +4403,7 @@ in {

    propagatedBuildInputs = with self; [
      pbr stevedore netaddr iso8601 six oslo-i18n oslo-utils Babel pyyaml eventlet
-      requests2 urllib3 oslo-concurrency suds-jurko
+      requests urllib3 oslo-concurrency suds-jurko
    ];
    buildInputs = with self; [
      bandit oslosphinx coverage testtools testscenarios testrepository mock
@ -4421,7 +4421,7 @@ in {
    };

    propagatedBuildInputs = with self; [
-      pbr argparse requests2 six keystoneclient cliff oslo-i18n oslo-serialization
+      pbr argparse requests six keystoneclient cliff oslo-i18n oslo-serialization
      oslo-utils
    ];
    buildInputs = with self; [
@ -4471,7 +4471,7 @@ in {
    buildInputs = with self; [
      pbr testtools testscenarios testrepository requests-mock fixtures ];
    propagatedBuildInputs = with self; [
-      Babel argparse prettytable requests2 simplejson six iso8601
+      Babel argparse prettytable requests simplejson six iso8601
      keystoneclient tempest-lib ];

    # TODO: check if removing this test is really harmless
@ -4582,7 +4582,7 @@ in {

    propagatedBuildInputs = with self; [
     pbr six Babel cliff os-client-config oslo-config oslo-i18n oslo-utils
-     glanceclient keystoneclient novaclient cinderclient neutronclient requests2
+     glanceclient keystoneclient novaclient cinderclient neutronclient requests
     stevedore cliff-tablib
    ];
    buildInputs = with self; [
@ -5203,7 +5203,7 @@ in {
    version = "1.1.0";

    buildInputs = with self; [ pytest ];
-    propagatedBuildInputs = with self; [ setuptools-git pytest-shutil pytest-fixture-config psutil requests2 ];
+    propagatedBuildInputs = with self; [ setuptools-git pytest-shutil pytest-fixture-config psutil requests ];

    meta = {
      description = "Extensible server fixures for py.test";
@ -5316,7 +5316,7 @@ in {
    };

    propagatedBuildInputs = with self; [ werkzeug ];
-    buildInputs = with self; [ pytest six requests2 ];
+    buildInputs = with self; [ pytest six requests ];

    checkPhase = ''
      py.test
@ -5554,7 +5554,7 @@ in {
  digital-ocean = buildPythonPackage rec {
    name = "python-digitalocean-1.10.1";

-    propagatedBuildInputs = with self; [ requests2 ];
+    propagatedBuildInputs = with self; [ requests ];

    # Package doesn't distribute tests.
    doCheck = false;
@ -5699,7 +5699,7 @@ in {

    buildInputs = with self; [ mock ];

-    propagatedBuildInputs = with self; [ requests2 six urllib3 ];
+    propagatedBuildInputs = with self; [ requests six urllib3 ];

    meta = {
      description = "Persistent cache for requests library";
@ -6047,7 +6047,7 @@ in {
      sha256 = "0a3616a818dd9fa61a61c3d9731d176e9123130d1b1b97a6beee63b4c72306b7";
    };

-    propagatedBuildInputs = with self; [ oauth2 requests2 ];
+    propagatedBuildInputs = with self; [ oauth2 requests ];

    meta = {
      description = "Official Python API client for Discogs";
@ -6156,7 +6156,7 @@ in {
    doCheck = false; # requires redis server
    propagatedBuildInputs = with self; [
      setuptools docker_registry_core blinker flask gevent gunicorn pyyaml
-      requests2 rsa sqlalchemy setuptools backports_lzma m2crypto
+      requests rsa sqlalchemy setuptools backports_lzma m2crypto
    ];

    patchPhase = "> requirements/main.txt";
@ -6253,7 +6253,7 @@ in {
      sha256 ="0ams289qcgna96aak96jbz6wybs6qb95h2gn8lb4lmx2p5sq4q56";
    };

-    propagatedBuildInputs = with self; [ requests2 six ];
+    propagatedBuildInputs = with self; [ requests six ];

    meta = {
      description = "Digital Ocean API python wrapper";
@ -6326,7 +6326,7 @@ in {
      sha256 = "f65c12bd97f09e29a951bc7cb30a74e005fc4b2f8bb48778796be3f73866b173";
    };

-    propagatedBuildInputs = with self; [ requests2 urllib3 mock setuptools ];
+    propagatedBuildInputs = with self; [ requests urllib3 mock setuptools ];

    meta = {
      description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs";
@ -6424,7 +6424,7 @@ in {
    # Check is disabled because running them destroy the content of the local cluster!
    # https://github.com/elasticsearch/elasticsearch-py/tree/master/test_elasticsearch
    doCheck = false;
-    propagatedBuildInputs = with self; [ urllib3 requests2 ];
+    propagatedBuildInputs = with self; [ urllib3 requests ];
    buildInputs = with self; [ nosexcover mock ];

    meta = {
@ -6506,7 +6506,7 @@ in {
      sed -i -e '13,14d;37d' setup.py
    '';

-    propagatedBuildInputs = with self; [ simplejson pytz requests2 ];
+    propagatedBuildInputs = with self; [ simplejson pytz requests ];

    # No proper tests are available
    doCheck = false;
@ -6811,7 +6811,7 @@ in {
    };

    disabled = !isPy3k;
-    propagatedBuildInputs = with self; [ docutils requests2 requests_download zipfile36];
+    propagatedBuildInputs = with self; [ docutils requests requests_download zipfile36];

    meta = {
      description = "A simple packaging tool for simple packages";
@ -7084,7 +7084,7 @@ in {
      mutagen
      protobuf3_0
      setuptools
-      requests2
+      requests
      dateutil
      proboscis
      mock
@ -7255,7 +7255,7 @@ in {
      pyasn1
      pycparser
      pycryptodome
-      requests2
+      requests
      six
    ];

@ -7279,7 +7279,7 @@ in {
    };
    buildInputs = with self; [ pytest responses ];