From e251a3e2cd733753247232dd3232a09e5f666636 Mon Sep 17 00:00:00 2001 From: Peter Gullekson Date: Sat, 28 Sep 2013 12:43:29 -0700 Subject: [PATCH] make os.walk return unicode strings s3 keys are in unicode, and our local paths need to be for same-file comparisons. --- bin/boto-rsync | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/boto-rsync b/bin/boto-rsync index 76278b2..436ad2a 100644 --- a/bin/boto-rsync +++ b/bin/boto-rsync @@ -469,7 +469,7 @@ def main(): sys.stdout.write('\n') # "Walk" the directory and upload files - for root, dirs, files in os.walk(path): + for root, dirs, files in os.walk(unicode(path)): if no_recurse: if root != path: continue @@ -599,7 +599,7 @@ def main(): if cloud_path and cloud_path in keys: del(keys[cloud_path]) - for root, dirs, files in os.walk(path): + for root, dirs, files in os.walk(unicode(path)): if no_recurse: if root != path: continue @@ -889,7 +889,7 @@ def main(): # If specified, perform deletes if delete: - for root, dirs, files in os.walk(path): + for root, dirs, files in os.walk(unicode(path)): if no_recurse: if root != path: continue