/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: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/symbol_versioning.py
81
81
        symbol = "%s.%s" % (a_callable.__module__,
82
82
                            a_callable.__name__)
83
83
    else:
84
 
        symbol = "%s.%s.%s" % (a_callable.im_class.__module__,
85
 
                               a_callable.im_class.__name__,
 
84
        symbol = "%s.%s.%s" % (a_callable.__self__.__class__.__module__,
 
85
                               a_callable.__self__.__class__.__name__,
86
86
                               a_callable.__name__
87
87
                               )
88
88
    return deprecation_version % symbol
96
96
 
97
97
        def decorated_function(*args, **kwargs):
98
98
            """This is the decorated function."""
99
 
            from breezy import trace
 
99
            from . import trace
100
100
            trace.mutter_callsite(4, "Deprecated function called")
101
101
            warn(deprecation_string(callable, deprecation_version),
102
102
                DeprecationWarning, stacklevel=2)
124
124
 
125
125
        def decorated_method(self, *args, **kwargs):
126
126
            """This is the decorated method."""
127
 
            from breezy import trace
 
127
            from . import trace
128
128
            if callable.__name__ == '__init__':
129
129
                symbol = "%s.%s" % (self.__class__.__module__,
130
130
                                    self.__class__.__name__,