From 92e336462259d404eb42f9db88ca691c413faaac Mon Sep 17 00:00:00 2001
From: Chris Wedgwood <cw@f00f.org>
Date: Thu, 20 Jan 2011 14:57:06 -0800
Subject: [PATCH] Make sure we pass strings correctly to functions that will
 behave badly otherwise (fix suggested by Chuck Thier).

Tweak account & container name output slightly (makes cut & paste
easier).
---
 bin/swift-account-audit | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bin/swift-account-audit b/bin/swift-account-audit
index ec71a05f45..c80a5ed49a 100755
--- a/bin/swift-account-audit
+++ b/bin/swift-account-audit
@@ -73,7 +73,7 @@ class Auditor(object):
 
     def audit_object(self, account, container, name):
         path = '/%s/%s/%s' % (account, container, name)
-        part, nodes = self.object_ring.get_nodes(account, container, name)
+        part, nodes = self.object_ring.get_nodes(account, container.encode('utf-8'), name.encode('utf-8'))
         container_listing = self.audit_container(account, container)
         consistent = True
         if name not in container_listing:
@@ -109,7 +109,7 @@ class Auditor(object):
                     etags.append(resp.getheader('ETag'))
                 else:
                     conn = http_connect(node['ip'], node['port'],
-                            node['device'], part, 'HEAD', path, {})
+                            node['device'], part, 'HEAD', path.encode('utf-8'), {})
                     resp = conn.getresponse()
                     if resp.status // 100 != 2:
                         self.object_not_found += 1
@@ -144,7 +144,7 @@ class Auditor(object):
         if (account, name) in self.list_cache:
             return self.list_cache[(account, name)]
         self.in_progress[(account, name)] = Event()
-        print 'Auditing container "%s"...' % name
+        print 'Auditing container "%s"' % name
         path = '/%s/%s' % (account, name)
         account_listing = self.audit_account(account)
         consistent = True
@@ -162,7 +162,7 @@ class Auditor(object):
                 try:
                     conn = http_connect(node['ip'], node['port'], node['device'],
                             part, 'GET', path, {},
-                            'format=json&marker=%s' % quote(marker))
+                            'format=json&marker=%s' % quote(marker.encode('utf-8')))
                     resp = conn.getresponse()
                     if resp.status // 100 != 2:
                         self.container_not_found += 1
@@ -220,7 +220,7 @@ class Auditor(object):
         if account in self.list_cache:
             return self.list_cache[account]
         self.in_progress[account] = Event()
-        print "Auditing account %s..." % account
+        print 'Auditing account "%s"' % account
         consistent = True
         path = '/%s' % account
         part, nodes = self.account_ring.get_nodes(account)