/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 breezy/symbol_versioning.py

  • Committer: Jelmer Vernooij
  • Date: 2019-03-04 05:10:44 UTC
  • mfrom: (7293 work)
  • mto: This revision was merged to the branch mainline in revision 7294.
  • Revision ID: jelmer@jelmer.uk-20190304051044-vph4s8p9qvpy2qe9
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/symbol_versioning.py
79
79
        symbol = "%s.%s.%s" % (a_callable.__self__.__class__.__module__,
80
80
                               a_callable.__self__.__class__.__name__,
81
81
                               a_callable.__name__)
82
 
    elif getattr(a_callable, '__qualname__', None) is not None and not '<' in a_callable.__qualname__:
 
82
    elif getattr(a_callable, '__qualname__', None) is not None and '<' not in a_callable.__qualname__:
83
83
        symbol = "%s.%s" % (a_callable.__module__,
84
84
                            a_callable.__qualname__)
85
85
    else:
317
317
    """
318
318
    def cleanup():
319
319
        if filter:
320
 
            warnings.filters.remove(filter)
 
320
            try:
 
321
                warnings.filters.remove(filter)
 
322
            except (ValueError, IndexError):
 
323
                pass
321
324
    return cleanup
322
325
 
323
326