Differentiate rest_endpoint from new endpoint param #127

Author: siznax

tests/test_basic.py

@@ -338,7 +338,7 @@ def test_page_query(self):
         qstr = page._query('wikidata', qobj)
         self.assertTrue('action=wbgetentities' in qstr)
 
-        page.params.update({'endpoint': '/page/summary/'})
+        page.params.update({'rest_endpoint': '/page/summary/'})
         qstr = page._query('restbase', qobj)
         self.assertTrue('api/rest' in qstr)
 
@@ -552,7 +552,8 @@ def test_page_get_random(self):
         self.assertTrue('requests' not in page.data)
 
     def test_page_get_restbase(self):
-        page = wptools.page('TEST', endpoint='summary', silent=SILENT_FLAG)
+        page = wptools.page('TEST', silent=SILENT_FLAG)
+        page.params.update({'rest_endpoint': 'summary'})
         page.cache = {'restbase': rest_summary.cache}
         page._set_data('restbase')
         data = page.data
@@ -799,8 +800,7 @@ def test_restbase_init(self):
         self.assertTrue('requests' not in page.data)
 
     def test_get_restbase_page(self):
-        page = wptools.restbase(silent=SILENT_FLAG)
-        page.params.update({'endpoint': '/page/'})
+        page = wptools.restbase('/page/', silent=SILENT_FLAG)
         page.cache['restbase'] = rest_page.cache
         page._set_data('restbase')
         self.assertTrue('requests' not in page.data)
@@ -840,7 +840,7 @@ def test_get_restbase_lead(self):
 
     def test_get_restbase_summary(self):
         page = wptools.restbase('TEST', silent=SILENT_FLAG)
-        page.params.update({'endpoint': '/page/summary/'})
+        page.params.update({'rest_endpoint': '/page/summary/'})
         page.cache['restbase'] = rest_summary.cache
         page._set_data('restbase')
 

wptools/page.py

@@ -157,7 +157,6 @@ def _query(self, action, qobj):
         title = self.params.get('title')
         pageid = self.params.get('pageid')
         wikibase = self.params.get('wikibase')
-        endpoint = self.params.get('endpoint')
 
         qstr = None
 
@@ -176,7 +175,7 @@ def _query(self, action, qobj):
         elif action == 'wikidata':
             qstr = qobj.wikidata(title, wikibase)
         elif action == 'restbase':
-            qstr = qobj.restbase(endpoint, title)
+            qstr = qobj.restbase(self.params.get('rest_endpoint'), title)
 
         if qstr is None:
             raise ValueError("Unknown action: %s" % action)

wptools/restbase.py

@@ -68,7 +68,8 @@ def _query(self, action, qobj):
         """
         returns WPToolsQuery string from action
         """
-        return qobj.restbase(self.params['endpoint'], self.params.get('title'))
+        return qobj.restbase(self.params['rest_endpoint'],
+                             self.params.get('title'))
 
     def _set_data(self, action):
         """
@@ -170,7 +171,6 @@ def get_restbase(self, endpoint='/page/',
 
         Optional {params}:
         - [title]: <str> Mediawiki page title, file, category, etc.
-        - [endpoint]: the RESTBase entry point (default=/page/)
         - [lang]: <str> Mediawiki language code (default=en)
 
         Optional arguments:
@@ -195,7 +195,7 @@ def get_restbase(self, endpoint='/page/',
         if endpoint != '/page/' and not self.params.get('title'):
             raise StandardError("endpoint %s needs a title" % endpoint)
 
-        self.params.update({'endpoint': endpoint})
+        self.params.update({'rest_endpoint': endpoint})
 
         self._get('restbase', show, proxy, timeout)