Skip to content

Commit

Permalink
Merge "Replace ' with " in aas/rest"
Browse files Browse the repository at this point in the history
  • Loading branch information
Jenkins authored and openstack-gerrit committed Jan 16, 2015
2 parents 49d8f19 + 20d6a0f commit dabfdce
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
16 changes: 8 additions & 8 deletions rally/aas/rest/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@


REST_SERVICE_OPTS = [
cfg.IntOpt('port',
cfg.IntOpt("port",
default=8877,
help='The port for the Rally API server',
help="The port for the Rally API server",
),
cfg.StrOpt('host',
default='0.0.0.0',
help='The listen IP for the Rally API server',
cfg.StrOpt("host",
default="0.0.0.0",
help="The listen IP for the Rally API server",
),
]
REST_OPT_GROUP = cfg.OptGroup(name='rest',
title='Options for the openstack-rally-api '
'service')
REST_OPT_GROUP = cfg.OptGroup(name="rest",
title="Options for the openstack-rally-api "
"service")

CONF = cfg.CONF
CONF.register_group(REST_OPT_GROUP)
Expand Down
2 changes: 1 addition & 1 deletion rally/aas/rest/controllers/root.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class Root(wtypes.Base):
@classmethod
def convert(self, name, description, versions):
root = Root(name=name, description=description)
root.versions = [v.get()['result'] for v in versions]
root.versions = [v.get()["result"] for v in versions]
return root


Expand Down
4 changes: 2 additions & 2 deletions rally/aas/rest/controllers/v1/root.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
class Version(types.Version):
@classmethod
def convert(cls):
v = super(Version, cls).convert('v1', 'CURRENT',
updated_at='2014-01-07T00:00:00Z')
v = super(Version, cls).convert("v1", "CURRENT",
updated_at="2014-01-07T00:00:00Z")
return v


Expand Down
4 changes: 2 additions & 2 deletions rally/aas/rest/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ def convert(cls, id, status, updated_at=None, media_types=None,
v = Version(id=id, status=status, updated_at=updated_at)
if media_types is None:
mime_type = "application/vnd.openstack.rally.%s+json" % id
media_types = [MediaType('application/json', mime_type)]
media_types = [MediaType("application/json", mime_type)]
v.media_types = media_types
if links is None:
links = [Link.make_link('self', pecan.request.host_url, id)]
links = [Link.make_link("self", pecan.request.host_url, id)]
v.links = links
return v

0 comments on commit dabfdce

Please sign in to comment.