changed Request to UKIDSSQuery

keflavich · keflavich · commit 1ed1b25e8a13 · 2012-06-26T21:02:07.000+02:00
diff --git a/astrodata/ukidss/ukidss.py b/astrodata/ukidss/ukidss.py
@@ -18,7 +18,7 @@
 import time
 import tempfile
 
-__all__ = ['Request']
+__all__ = ['Query']
 
 class LinksExtractor(htmllib.HTMLParser):  # derive new HTML parser
 
@@ -46,9 +46,9 @@ def get_links(self):
     'difference', 'all']
 
 
-class Request():
+class UKIDSSQuery():
     """
-    The Request class.  Must instantiate this class in order to make any
+    The Query class.  Must instantiate this class in order to make any
     queries.  Allows registered users to login, but defaults to using the
     public UKIDSS data sets.
     """
@@ -124,7 +124,7 @@ def get_image_gal(self, glon, glat, filter='all', frametype='stack',
 
         Examples
         --------
-        >>> R = Request()
+        >>> R = Query()
         >>> fitsfile = R.get_image_gal(10.5,0.0)
         """
 
@@ -241,7 +241,7 @@ def get_images_radius(self, ra, dec, radius, filter='all',
 
         Examples
         --------
-        >>> R = Request()
+        >>> R = Query()
         >>> fitsfile = R.get_image_gal(10.5,0.0)
         """
 
@@ -365,7 +365,7 @@ def get_catalog_gal(self, glon, glat, directory=None, radius=1, save=False):
 
         Example
         -------
-        >>> R = Request()
+        >>> R = Query()
         >>> data = R.get_catalog_gal(10.625,-0.38,radius=0.1)
         >>> bintable = data[0][1]
         """
diff --git a/docs/astrodata/ukidss.rst b/docs/astrodata/ukidss.rst
@@ -10,10 +10,10 @@ Getting started
 The following example illustrates an UKIDSS catalog/image query::
 
     >>> from astrodata import ukidss
-    >>> R = ukidss.Request()
-    >>> fitsfile = R.get_image_gal(10.5,0.0)
-    >>> fitsfile = R.get_image_gal(10.5,0.0)
-    >>> data = R.get_catalog_gal(10.625,-0.38,radius=0.1)
+    >>> Q = ukidss.UKIDSSQuery()
+    >>> fitsfile = Q.get_image_gal(10.5,0.0)
+    >>> fitsfile = Q.get_image_gal(10.5,0.0)
+    >>> data = Q.get_catalog_gal(10.625,-0.38,radius=0.1)
     >>> bintable = data[0][1]
 
 
