1.1 --- a/deducer.py Fri Oct 07 21:18:06 2016 +0200
1.2 +++ b/deducer.py Thu Oct 06 14:29:02 2016 +0200
1.3 @@ -20,7 +20,7 @@
1.4 """
1.5
1.6 from common import first, get_attrname_from_location, get_attrnames, \
1.7 - init_item, make_key, sorted_output, \
1.8 + get_name_path, init_item, make_key, sorted_output, \
1.9 CommonOutput
1.10 from encoders import encode_attrnames, encode_access_location, \
1.11 encode_constrained, encode_location, encode_usage, \
1.12 @@ -1271,7 +1271,7 @@
1.13
1.14 # Obtain references to known objects.
1.15
1.16 - path = self.get_name_path(unit_path, name)
1.17 + path = get_name_path(unit_path, name)
1.18
1.19 class_types, only_instance_types, module_types, constrained_specific = \
1.20 self.constrain_types(path, class_types, only_instance_types, module_types)
1.21 @@ -1547,7 +1547,7 @@
1.22 """
1.23
1.24 location, name, attrnames, version = access_location
1.25 - path = self.get_name_path(location, name)
1.26 + path = get_name_path(location, name)
1.27
1.28 # Use initialiser information, if available.
1.29
1.30 @@ -1557,15 +1557,6 @@
1.31 else:
1.32 return None
1.33
1.34 - def get_name_path(self, path, name):
1.35 -
1.36 - "Return a suitable qualified name from the given 'path' and 'name'."
1.37 -
1.38 - if "." in name:
1.39 - return name
1.40 - else:
1.41 - return "%s.%s" % (path, name)
1.42 -
1.43 def record_reference_types(self, location, class_types, instance_types,
1.44 module_types, constrained, constrained_specific=False):
1.45