summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Lamar <brian.lamar@rackspace.com>2011-06-02 12:02:16 -0400
committerBrian Lamar <brian.lamar@rackspace.com>2011-06-02 12:02:16 -0400
commit7ca707c1cbfb3164d4b6f706a4e9720e54bcc35f (patch)
tree7b438b06810b516301498aa0d05bff56ee99f39c
parente28a6e96ec45439ed24a363f27d0421d720add0b (diff)
downloadnova-7ca707c1cbfb3164d4b6f706a4e9720e54bcc35f.tar.gz
nova-7ca707c1cbfb3164d4b6f706a4e9720e54bcc35f.tar.xz
nova-7ca707c1cbfb3164d4b6f706a4e9720e54bcc35f.zip
Minor comment formatting changes.
-rw-r--r--nova/api/openstack/common.py6
-rw-r--r--nova/api/openstack/images.py2
2 files changed, 5 insertions, 3 deletions
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index 559b44ef5..40fb59765 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -36,16 +36,16 @@ XML_NS_V11 = 'http://docs.openstack.org/compute/api/v1.1'
def get_pagination_params(request):
- """
- Return marker, limit tuple from request
+ """Return marker, limit tuple from request.
- @param request: `wsgi.Request` possibly containing 'marker' and 'limit'
+ :param request: `wsgi.Request` possibly containing 'marker' and 'limit'
GET variables. 'marker' is the id of the last element
the client has seen, and 'limit' is the maximum number
of items to return. If 'limit' is not specified, 0, or
> max_limit, we default to max_limit. Negative values
for either marker or limit will cause
exc.HTTPBadRequest() exceptions to be raised.
+
"""
try:
marker = int(request.GET.get('marker', 0))
diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 7f06c53df..73249b485 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -130,6 +130,7 @@ class ControllerV10(Controller):
"""Return an index listing of images available to the request.
:param req: `wsgi.Request` object
+
"""
context = req.environ['nova.context']
filters = self._get_filters(req)
@@ -142,6 +143,7 @@ class ControllerV10(Controller):
"""Return a detailed index listing of images available to the request.
:param req: `wsgi.Request` object.
+
"""
context = req.environ['nova.context']
filters = self._get_filters(req)