updated whatsnew and ensured Rebase to pandas-dev/master

Author: Sky NSS

doc/source/whatsnew/v0.21.0.txt

@@ -86,52 +86,46 @@ Other Enhancements
 
 If `python-requests` library is installed try to use it first. If not, continue using urllib
 The :meth:`DataFrame.read_csv`, :meth:`DataFrame.read_html`, :meth:`DataFrame.read_json`,
-:meth:`DataFrame.read_excel` now allow optional param of ``req_session`` to pass in requests.Session()
+:meth:`DataFrame.read_excel` now allow optional param of ``url_params`` to pass in 
+parameters for basic auth, disable ssl strict check or even a requests.Session() object
 
 
 .. ipython:: python
   import pandas as pd
-  from requests import Session
 
-  # req_session is optional parameter 
+  # url_params is optional parameter 
   df = pd.read_csv('https://uname:[email protected]/bb.csv') # now url can contain username and pwd
 
-  # custom auth can be implemented
-  s = Session()
+  # Basic Auth
+  df = pd.read_csv('https://aa.com/bb.csv', url_params={ 'auth': ('john', 'pwd') } ) # now url can contain username and pwd
+  
+  # Basic Auth And disable verification of SSL certificate eg: testing
+  up = { 'auth': ('john', 'pwd') , 'verify' : False}
+  df = pd.read_csv('https://aa.com/bb.csv', url_params=up ) # now url can contain username and pwd
+
+  # Optionally, A requests.Session() can also be passed into url_params
+  import requests
+  s = requests.Session()
   s.auth = MyAuthProvider('secret-key') # custom auth provider supported by requests
-  df = pd.read_csv(url, req_session=s)
+  df = pd.read_csv(url, url_params=s)
 
-  # optional advanced scenarios: basic auth, timeout, disable ssl certificate verification, proxy, etc
+  # For advanced users, this may provide extensibility. However, testing on pandas side is limited to basic scenarios
+  # here is an example of advanced scenario
   s = Session()
   s.auth = ('darth', 'l0rd')  # if user wants to perform basic auth Skip if url itself contains username and pwd
   s.timeout = (3.05, 27)                           # if user wants to modify timeout
   s.verify = False                                      # if user wants to disable ssl cert verification
   s.headers.update( {'User-Agent': 'Custom user agent'} )  # extensible to set any custom header needed
   s.proxies = { 'http': 'http://a.com:100'}  # if user has proxies 
   s.cert = '/path/client.cert'                     # if custom cert is needed
-  df = pd.read_csv( 'https://aa.com/bbb.csv', req_session=s)
-
-  # support verbs other than 'GET' such as 'POST' using requests.PreparedRequest
-  r = Request('POST', 'http://joker:pwd@nlp_service.api/email_sentiment_extract?out=json')
-  prepped = req.prepare()
-  prepped.body = 'from: [email protected]\nto: [email protected]\nsubject:Complaint letter\n\nbody: I am feeling :(' # multiple lines
-  df = pd.read_json( prepped) # minor update pandas code to detect type(Request) and submit it using requests session in lieu of URL.
-  """
-  [{
-    'from': '[email protected]',
-    'to': '[email protected]',
-    'email_type': 'complaint',
-    'sentiment': 'unhappy',
-  }]
-  """
-  
-  # Event hooks callback (eg log http status codes or other callback related functions)
+  df = pd.read_csv( 'https://aa.com/bbb.csv', url_params=s)
+
   def print_http_status(r, *args, **kwargs):
       print(r.status_code)
       print(r.headers['Content-Length'])
   s = Session()
   s.hooks = dict(response=print_http_status)
-  df = pd.read_csv( 'https://aa.com/bbb.csv', req_session=s)
+  df = pd.read_csv( 'https://aa.com/bbb.csv', url_params=s)