/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/rio.py

  • Committer: John Arbash Meinel
  • Date: 2009-10-13 17:06:15 UTC
  • mto: (4634.52.17 2.0)
  • mto: This revision was merged to the branch mainline in revision 4747.
  • Revision ID: john@arbash-meinel.com-20091013170615-4q6ff014r3cj5ecb
https://launchpad.net/bugs/440062
Fix bug #44062, Always suppress deprecation warnings.

Python 2.6 now 'comes with' a deprecation warning suppression as part of
the threading module. So the current check that says 'if someone manually
configured a deprecation warning filter, don't add ours' now breaks
because there is always one present.
So instead, we just always suppress all deprecation warnings if we are in
a 'final' release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/rio.py
32
32
 
33
33
import re
34
34
 
35
 
from bzrlib import osutils
36
35
from bzrlib.iterablefile import IterableFile
37
36
 
38
37
# XXX: some redundancy is allowing to write stanzas in isolation as well as
378
377
        _read_stanza_unicode,
379
378
        _valid_tag,
380
379
        )
381
 
except ImportError, e:
382
 
    osutils.failed_to_load_extension(e)
 
380
except ImportError:
383
381
    from bzrlib._rio_py import (
384
382
       _read_stanza_utf8,
385
383
       _read_stanza_unicode,