← Back to team overview

duplicity-team team mailing list archive

[Merge] lp:~mterry/duplicity/uexc-string into lp:duplicity

 

Michael Terry has proposed merging lp:~mterry/duplicity/uexc-string into lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~mterry/duplicity/uexc-string/+merge/368636

The return type of util.uexc should always be a string. Without this change, the exception handler at the bottom of bin/duplicity will silently error out when trying to do 'if u"Forced assertion for testing" in util.uexc(e)' instead of logging the exception.

(You can't test for membership in None.)
-- 
Your team duplicity-team is requested to review the proposed merge of lp:~mterry/duplicity/uexc-string into lp:duplicity.
=== modified file 'duplicity/util.py'
--- duplicity/util.py	2019-03-10 21:46:31 +0000
+++ duplicity/util.py	2019-06-11 02:04:38 +0000
@@ -119,7 +119,7 @@
             # Encoded, likely in filesystem encoding
             return fsdecode(m)
     else:
-        return None
+        return u''
 
 
 def maybe_ignore_errors(fn):


Follow ups