Rev 2112: (mbp) #45205 fix errors when running under python -O in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2112
revision-id: pqm at pqm.ubuntu.com-20061102072902-8b3d43db5d36ec5b
parent: pqm at pqm.ubuntu.com-20061101002736-d281cb52e4fde42a
parent: mbp at sourcefrog.net-20061102070158-573aa2cfee9e1c55
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-11-02 07:29:02 +0000
message:
  (mbp) #45205 fix errors when running under python -O
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20061102070158-573aa2cfee9e1c55
    parent: mbp at sourcefrog.net-20061029014934-a5273eebfca6226d
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dash-o
    timestamp: Thu 2006-11-02 18:01:58 +1100
    message:
      Make check should run under python -O too
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20061029014934-a5273eebfca6226d
    parent: mbp at sourcefrog.net-20061029014915-47f151a2834f8a6d
    parent: mbp at sourcefrog.net-20061029014854-71098cfee1da5e20
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dot-o
    timestamp: Sun 2006-10-29 09:49:34 +0800
    message:
      merge listdir test fix so tests work on tmpfs
        ------------------------------------------------------------
        merged: mbp at sourcefrog.net-20061029014854-71098cfee1da5e20
        parent: pqm at pqm.ubuntu.com-20061024165011-69d7663639e20a97
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: listdir
        timestamp: Sun 2006-10-29 09:48:54 +0800
        message:
          Tests shouldn't assume os.listdir returns sorted results
          The manual specifically says it doesn't.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20061029014915-47f151a2834f8a6d
    parent: mbp at sourcefrog.net-20061029014429-77497a4f933e6dfd
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dot-o
    timestamp: Sun 2006-10-29 09:49:15 +0800
    message:
      Fix an assertion with side effects
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20061029014429-77497a4f933e6dfd
    parent: pqm at pqm.ubuntu.com-20061019033052-b281d3ab3cf08c08
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dot-o
    timestamp: Sun 2006-10-29 09:44:29 +0800
    message:
      Fix some code which relies on assertions and breaks under python -O