duplicity-team team mailing list archive

[edso <edgar.soldin@xxxxxx>]

edso has proposed merging lp:~ed.so/duplicity/24syntaxfix into lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~ed.so/duplicity/24syntaxfix/+merge/131843

fix python 2.4 vs 2.5 syntax error

see
http://lists.nongnu.org/archive/html/duplicity-talk/2012-10/msg00027.html

-- 
https://code.launchpad.net/~ed.so/duplicity/24syntaxfix/+merge/131843
Your team duplicity-team is requested to review the proposed merge of lp:~ed.so/duplicity/24syntaxfix into lp:duplicity.

=== modified file 'duplicity/commandline.py'
--- duplicity/commandline.py	2012-09-10 17:27:00 +0000
+++ duplicity/commandline.py	2012-10-29 10:07:22 +0000
@@ -185,7 +185,7 @@
         which is default encoding in python3 and most recent unixes
         """
         encoding = getattr(file, "encoding", None)
-        return encoding if encoding else 'utf-8'
+        return encoding or 'utf-8'
 
     def print_help(self, file=None):
         """