From 23fc2286edbc1b6d3c6c64691e9faa691445f59c Mon Sep 17 00:00:00 2001
From: Ed Cranford <ed.cranford@rackspace.com>
Date: Wed, 4 Apr 2012 12:43:44 -0500
Subject: [PATCH] Removed some overzealous wrapping.

---
 reddwarf/guestagent/api.py     | 4 ++--
 reddwarf/guestagent/dbaas.py   | 4 ++--
 reddwarf/guestagent/manager.py | 2 +-
 reddwarf/instance/models.py    | 6 +++---
 reddwarf/instance/service.py   | 6 +++---
 reddwarf/rpc/amqp.py           | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/reddwarf/guestagent/api.py b/reddwarf/guestagent/api.py
index 2efadc7ae8..219ff10759 100644
--- a/reddwarf/guestagent/api.py
+++ b/reddwarf/guestagent/api.py
@@ -144,7 +144,7 @@ class API(object):
                      "args": {'updated_memory_size': updated_memory_size}
                     })
         except Exception as e:
-            LOG.error(_(e))
+            LOG.error(e)
             raise exception.GuestError(original_message=str(e))
 
     def stop_mysql(self):
@@ -156,7 +156,7 @@ class API(object):
                      "args": {}
                     })
         except Exception as e:
-            LOG.error(_(e))
+            LOG.error(e)
             raise exception.GuestError(original_message=str(e))
 
     def upgrade(self):
diff --git a/reddwarf/guestagent/dbaas.py b/reddwarf/guestagent/dbaas.py
index 081f5f95eb..e5650576af 100644
--- a/reddwarf/guestagent/dbaas.py
+++ b/reddwarf/guestagent/dbaas.py
@@ -76,7 +76,7 @@ def get_engine():
                                    pool_recycle=7200, echo=True,
                                    listeners=[KeepAliveConnection()])
         else:
-            LOG.error(_(err))
+            LOG.error(err)
         return ENGINE
 
 
@@ -232,7 +232,7 @@ class DBaaSAgent(object):
             except exc.OperationalError as err:
                 # Ignore, user is already created, just reset the password
                 # TODO(rnirmal): More fine grained error checking later on
-                LOG.debug(_(err))
+                LOG.debug(err)
         with client:
             t = text("""UPDATE mysql.user SET Password=PASSWORD(:pwd)
                            WHERE User=:user;""")
diff --git a/reddwarf/guestagent/manager.py b/reddwarf/guestagent/manager.py
index 95eb584ccd..5f536dfdb5 100644
--- a/reddwarf/guestagent/manager.py
+++ b/reddwarf/guestagent/manager.py
@@ -46,7 +46,7 @@ class GuestManager(service.Manager):
                              'reddwarf.guestagent.pkg.PkgAgent']
         classes = []
         for guest_driver in guest_drivers:
-            LOG.info(_(guest_driver))
+            LOG.info(guest_driver)
             driver = utils.import_class(guest_driver)
             classes.append(driver)
         try:
diff --git a/reddwarf/instance/models.py b/reddwarf/instance/models.py
index 2bc3c3d64b..ca284c3064 100644
--- a/reddwarf/instance/models.py
+++ b/reddwarf/instance/models.py
@@ -215,9 +215,9 @@ class Instance(object):
         """
         if self.status not in VALID_ACTION_STATUSES:
             msg = "Instance is not currently available for an action to be " \
-                  "performed. Status [%s]" % self.status
-            LOG.debug(_(msg))
-            raise rd_exceptions.UnprocessableEntity(msg)
+                  "performed. Status [%s]"
+            LOG.debug(_(msg) % self.status)
+            raise rd_exceptions.UnprocessableEntity(_(msg) % self.status)
 
 
 def create_server_list_matcher(server_list):
diff --git a/reddwarf/instance/service.py b/reddwarf/instance/service.py
index 6d0517ce90..a5ccadd403 100644
--- a/reddwarf/instance/service.py
+++ b/reddwarf/instance/service.py
@@ -116,7 +116,7 @@ class InstanceController(BaseController):
         except exception.ReddwarfError, e:
             # TODO(hub-cap): come up with a better way than
             #    this to get the message
-            LOG.error(_(e))
+            LOG.error(e)
             return wsgi.Result(str(e), 404)
         # TODO(cp16net): need to set the return code correctly
         return wsgi.Result(views.InstanceDetailView(server).data(), 200)
@@ -134,7 +134,7 @@ class InstanceController(BaseController):
         except exception.ReddwarfError, e:
             # TODO(hub-cap): come up with a better way than
             #    this to get the message
-            LOG.error(_(e))
+            LOG.error(e)
             return wsgi.Result(str(e), 404)
 
         instance.delete()
@@ -181,7 +181,7 @@ class InstanceController(BaseController):
         try:
             volume_size = float(size)
         except (ValueError, TypeError) as err:
-            LOG.error(_(err))
+            LOG.error(err)
             msg = ("Required element/key - instance volume"
                    "'size' was not specified as a number")
             raise rd_exceptions.ReddwarfError(msg)
diff --git a/reddwarf/rpc/amqp.py b/reddwarf/rpc/amqp.py
index 71df795cfc..0b3ee5a3de 100644
--- a/reddwarf/rpc/amqp.py
+++ b/reddwarf/rpc/amqp.py
@@ -143,7 +143,7 @@ def msg_reply(msg_id, connection_pool, reply=None, failure=None, ending=False):
             message = str(failure[1])
             tb = traceback.format_exception(*failure)
             LOG.error(_("Returning exception %s to caller"), message)
-            LOG.error(_(tb))
+            LOG.error(tb)
             failure = (failure[0].__name__, str(failure[1]), tb)
 
         try: