[Pkg-bazaar-commits] ./bzr-gtk/unstable r613: Fix #279831: Don't always expect True the object to be used as a Truth value

[Vincent Ladeuil]

------------------------------------------------------------
revno: 613
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: gtk
timestamp: Tue 2008-10-21 14:17:28 +0200
message:
  Fix #279831: Don't always expect True the object to be used as a Truth value
modified:
  diff.py
    ------------------------------------------------------------
    revno: 605.1.1
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: gtk
    timestamp: Tue 2008-10-07 15:59:01 -0500
    message:
      just use changed_content as a truth value, rather than checking 'is True'
    modified:
      diff.py
-------------- next part --------------
=== modified file 'diff.py'
--- a/diff.py	2008-07-25 13:32:06 +0000
+++ b/diff.py	2008-10-07 20:59:01 +0000
@@ -689,7 +689,7 @@
                     change_type = kind_changed
                     display_path = (paths[0] + source_marker
                                     + ' => ' + paths[1] + marker)
-                elif changed_content is True or executables[0] != executables[1]:
+                elif changed_content or executables[0] != executables[1]:
                     change_type = modified
                 else:
                     assert False, "How did we get here?"