Fit and finish

Author: Sky NSS

pandas/io/common.py

@@ -49,9 +49,9 @@
 
 try:
     import requests
-    _PY_REQUESTS_INSTALLED = True
+    _REQUESTS_INSTALLED = True
 except ImportError:
-    _PY_REQUESTS_INSTALLED = False
+    _REQUESTS_INSTALLED = False
 
 
 if compat.PY3:
@@ -99,11 +99,6 @@ def __next__(self):
     BaseIterator.next = lambda self: self.__next__()
 
 
-def is_requests_pkg_avail():
-    """Checks if 'python-requests' package is already installed."""
-    return _PY_REQUESTS_INSTALLED
-
-
 def _is_url(url):
     """Check to see if a URL has a valid protocol.
 
@@ -228,9 +223,9 @@ def fetch_url(url, http_params=None, skip_requests=False):
 
     http_params : dict or requests.Session(), default None
         A python dict containing:
-            'auth': tuple (str, str) eg (unae, pwd)
+            'auth': tuple (str, str) eg (username, password)
             'auth': Any other auth object accepted by requests
-            'verify': boolean, Default True
+            'verify': boolean, default True
                  If False, allow self signed and invalid SSL cert for https
         or
         A python requests.Session object if http(s) path to enable basic auth
@@ -249,14 +244,14 @@ def fetch_url(url, http_params=None, skip_requests=False):
     if not http_params:
         skip_requests = True
     if (not skip_requests) and \
-            is_requests_pkg_avail() and \
+            _REQUESTS_INSTALLED and \
             _is_handled_by_requests(url):
         s = gen_session(http_params)
         resp = s.get(url)
         resp.raise_for_status()
         content_bytes = resp.content
     else:
-        if http_params and (skip_requests or not is_requests_pkg_avail()):
+        if http_params and (skip_requests or not _REQUESTS_INSTALLED):
             msg = 'To utilize http_params, python-requests library is ' + \
                   'required but not detected'
             raise ValueError(msg)
@@ -285,7 +280,7 @@ def get_filepath_or_buffer(filepath_or_buffer, encoding=None,
         A python dict containing:
             'auth': tuple (str, str) eg (unae, pwd)
             'auth': Any other auth object accepted by requests
-            'verify': boolean, Default True
+            'verify': boolean, default True
                  If False, allow self signed and invalid SSL cert for https
         or
         A python requests.Session object if http(s) path to enable basic auth

pandas/io/html.py

@@ -127,7 +127,7 @@ def _read(obj, http_params=None):
         A python dict containing:
             'auth': tuple (str, str) eg (unae, pwd)
             'auth': Any other auth object accepted by requests
-            'verify': boolean, Default True
+            'verify': boolean, default True
                  If False, allow self signed and invalid SSL certs for https
         or
         A python requests.Session object if http(s) path to enable basic auth

pandas/tests/io/test_http_auth.py

@@ -2,7 +2,7 @@
 import pandas as pd
 import pandas.util.testing as tm
 
-if pd.io.common.is_requests_pkg_avail():
+if pd.io.common._REQUESTS_INSTALLED:
     from requests.packages.urllib3.exceptions import InsecureRequestWarning
     import requests
     requests_pkg = True