Merge "Remove the gettext wrapper of server_type."

openstack/swift

Code Issues Proposed changes

Browse Source

This commit is contained in:

Jenkins

2012年08月29日 18:19:17 +00:00

committed by Gerrit Code Review

parent 6e524a3a72 2a38a04092

commit 859afd6f49

4 changed files with 4 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2
swift/proxy/controllers/account.py

View File

@@ -39,7 +39,7 @@ from swift.proxy.controllers.base import Controller

class AccountController(Controller):

"""WSGI controller for account requests"""

server_type = _('Account')

server_type = 'Account'

def __init__(self, app, account_name, **kwargs):

Controller.__init__(self, app)

2
swift/proxy/controllers/base.py

View File

@@ -87,7 +87,7 @@ def get_container_memcache_key(account, container):

class Controller(object):

"""Base WSGI controller class for the proxy"""

server_type = _('Base')

server_type = 'Base'

# Ensure these are all lowercase

pass_through_headers = []

2
swift/proxy/controllers/container.py

View File

@@ -40,7 +40,7 @@ from swift.proxy.controllers.base import Controller, delay_denial, \

class ContainerController(Controller):

"""WSGI controller for container requests"""

server_type = _('Container')

server_type = 'Container'

# Ensure these are all lowercase

pass_through_headers = ['x-container-read', 'x-container-write',

2
swift/proxy/controllers/obj.py

View File

@@ -232,7 +232,7 @@ class SegmentedIterable(object):

class ObjectController(Controller):

"""WSGI controller for object requests."""

server_type = _('Object')

server_type = 'Object'

def __init__(self, app, account_name, container_name, object_name,

**kwargs):