Duplicity

Merge lp:~ed.so/duplicity/24syntaxfix into lp:duplicity/0.6

  1. 24syntaxfix
  2. Merge into 0.6-series
Proposed by edso
Status: Merged
Merge reported by: Kenneth Loafman
Merged at revision: not available
Proposed branch: lp:~ed.so/duplicity/24syntaxfix
Merge into: lp:duplicity/0.6
Diff against target: 12 lines (+1/-1)
1 file modified
duplicity/commandline.py (+1/-1)
To merge this branch: bzr merge lp:~ed.so/duplicity/24syntaxfix
Reviewer Review Type Date Requested Status
duplicity-team Pending
Review via email: mp+131843@code.launchpad.net

Description of the change

fix python 2.4 vs 2.5 syntax error

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'duplicity/commandline.py'
2--- duplicity/commandline.py 2012-09-10 17:27:00 +0000
3+++ duplicity/commandline.py 2012-10-29 10:07:22 +0000
4@@ -185,7 +185,7 @@
5 which is default encoding in python3 and most recent unixes
6 """
7 encoding = getattr(file, "encoding", None)
8- return encoding if encoding else 'utf-8'
9+ return encoding or 'utf-8'
10
11 def print_help(self, file=None):
12 """

Subscribers

People subscribed via source and target branches

to all changes: