Merge "Remove the gettext wrapper of server_type."

swift/proxy/controllers/account.py

@@ -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)

swift/proxy/controllers/base.py

@@ -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 = []

swift/proxy/controllers/container.py

@@ -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',

swift/proxy/controllers/obj.py

@@ -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):