/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/smart/branch.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
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:
105
105
 
106
106
class SmartServerBranchSetTagsBytes(SmartServerLockedBranchRequest):
107
107
 
108
 
    def __init__(self, backing_transport, root_client_path='/', jail_root=None):
 
108
    def __init__(self, backing_transport, root_client_path='/'):
109
109
        SmartServerLockedBranchRequest.__init__(
110
 
            self, backing_transport, root_client_path, jail_root)
 
110
            self, backing_transport, root_client_path)
111
111
        self.locked = False
112
112
        
113
113
    def do_with_locked_branch(self, branch):