← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_symbol_versioning.py

  • Committer: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_symbol_versioning.py
1
 
# Copyright (C) 2006, 2007, 2009 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
179
179
    def check_deprecated_callable(self, expected_warning, expected_docstring,
180
180
                                  expected_name, expected_module,
181
181
                                  deprecated_callable):
 
182
        if __doc__ is None:
 
183
            # With -OO the docstring should just be the deprecated version
 
184
            expected_docstring = expected_docstring.split('\n')[-2].lstrip()
182
185
        old_warning_method = symbol_versioning.warn
183
186
        try:
184
187
            symbol_versioning.set_warning_method(self.capture_warning)