Error "you cannot specify None for the display encoding" on commit

[Edmund]

Getting this error after commiting:

bzr: ERROR: exceptions.ValueError: you cannot specify None for the display encoding

Traceback (most recent call last):
  File "/opt/local/lib/python2.5/site-packages/bzrlib/commands.py", line 893, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/opt/local/lib/python2.5/site-packages/bzrlib/commands.py", line 839, in run_bzr
    ret = run(*run_argv)
  File "/opt/local/lib/python2.5/site-packages/bzrlib/commands.py", line 539, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/opt/local/lib/python2.5/site-packages/bzrlib/builtins.py", line 2435, in run
    exclude=safe_relpath_files(tree, exclude))
  File "/opt/local/lib/python2.5/site-packages/bzrlib/decorators.py", line 192, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/opt/local/lib/python2.5/site-packages/bzrlib/workingtree_4.py", line 235, in commit
    result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
  File "/opt/local/lib/python2.5/site-packages/bzrlib/decorators.py", line 192, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/opt/local/lib/python2.5/site-packages/bzrlib/mutabletree.py", line 202, in commit
    *args, **kwargs)
  File "/opt/local/lib/python2.5/site-packages/bzrlib/commit.py", line 412, in commit
    self.branch.set_last_revision_info(new_revno, self.rev_id)
  File "/opt/local/lib/python2.5/site-packages/bzrlib/decorators.py", line 192, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/opt/local/lib/python2.5/site-packages/bzrlib/branch.py", line 2129, in set_last_revision_info
    self._run_post_change_branch_tip_hooks(old_revno, old_revid)
  File "/opt/local/lib/python2.5/site-packages/bzrlib/branch.py", line 1655, in _run_post_change_branch_tip_hooks
    hook(params)
  File "/Users/edmund/.bazaar/plugins/upload/auto_upload_hook.py", line 40, in auto_upload_hook
    sys.stdout.encoding)
  File "/opt/local/lib/python2.5/site-packages/bzrlib/urlutils.py", line 587, in unescape_for_display
    raise ValueError('you cannot specify None for the display encoding')
ValueError: you cannot specify None for the display encoding

bzr 1.10 on python 2.5.2 (darwin)
arguments: ['/opt/local/bin/bzr', 'commit', '-m', 'Added 500 error page']
encoding: 'ascii', fsenc: 'utf-8', lang: 'en_US.UTF-8'
plugins:
  bzr_push_and_update /Users/edmund/.bazaar/plugins/bzr_push_and_update [0.2dev]
  launchpad /opt/local/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown]
  upload /Users/edmund/.bazaar/plugins/upload [0.1.1]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.

And after that, if I do a 'bzr upload', I get this error:

Working tree "/directory" has uncommitted changes.

It can only be rectified after I do a 'bzr update' and 'bzr upload' works again.

[Edmund (edmund-kwok)]

Here's a patch for anyone who's facing the same problem.