~ubuntu-branches/ubuntu/saucy/python-novaclient/saucy-proposed

« back to all changes in this revision

Viewing changes to novaclient/v1_1/security_groups.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2013-09-24 09:15:12 UTC
  • mfrom: (1.1.31)
  • Revision ID: package-import@ubuntu.com-20130924091512-yjzov9e7qa8sdb1v
Tags: 1:2.15.0-0ubuntu1
* New upstream version.
* debian/control:
  - Add python-babel, python-keyring, and python-six build-depends.
  - Dropped python-argparse, python-setuptools-git, python-httplib2,
    python-nose as a build-depends.
  - Dropped python-httplib2 and python-keyring as a dependency.
  - Add versioned depends for python-requests, python-simplejson,
    python-fixtures, testrepesitory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
Security group interface (1.1 extension).
18
18
"""
19
19
 
20
 
import urllib
21
 
 
22
20
import six
23
21
 
24
22
from novaclient import base
 
23
from novaclient.openstack.common.py3kcompat import urlutils
25
24
 
26
25
 
27
26
class SecurityGroup(base.Resource):
91
90
 
92
91
        qparams = dict((k, v) for (k, v) in six.iteritems(search_opts) if v)
93
92
 
94
 
        query_string = '?%s' % urllib.urlencode(qparams) if qparams else ''
 
93
        query_string = '?%s' % urlutils.urlencode(qparams) if qparams else ''
95
94
 
96
95
        return self._list('/os-security-groups%s' % query_string,
97
96
                          'security_groups')