Permalink
Browse files

Merge pull request #1 from tomwilkie/master

Make it work on python2.4 again
  • Loading branch information...
2 parents 490cca0 + 6012d1b commit 367793584e2da910c418f3d0dd104e1b3fcfb752 @econnell committed Jun 11, 2012
Showing with 5 additions and 1 deletion.
  1. +5 −1 s3cmd
View
6 s3cmd
@@ -284,7 +284,11 @@ def cmd_object_put(args):
for key in exclude_list:
output(u"exclude: %s" % unicodise(key))
for key in local_list:
- output(u"upload: %s -> %s" % (local_list[key]['full_name_unicode'] if key != "-" else "<stdin>", local_list[key]['remote_uri']))
+ if key != "-":
+ nicekey = local_list[key]['full_name_unicode']
+ else:
+ nicekey = "<stdin>"
+ output(u"upload: %s -> %s" % (nicekey, local_list[key]['remote_uri']))
warning(u"Exitting now because of --dry-run")
return

0 comments on commit 3677935

Please sign in to comment.