Lichen

Changeset

711:8453ca48a980
2017-03-12 Paul Boddie raw files shortlog changelog graph Added missing changes from the recent merge. return-value-definition
resolving.py (file)
     1.1 --- a/resolving.py	Sun Mar 12 17:58:14 2017 +0100
     1.2 +++ b/resolving.py	Sun Mar 12 18:03:25 2017 +0100
     1.3 @@ -331,13 +331,12 @@
     1.4              # but they may be resolvable later.
     1.5  
     1.6              if not ref:
     1.7 -                if not invocation:
     1.8  
     1.9 -                    # Record the path used for tracking purposes
    1.10 -                    # alongside original name, attribute and access
    1.11 -                    # number details.
    1.12 +                # Record the path used for tracking purposes
    1.13 +                # alongside original name, attribute and access
    1.14 +                # number details.
    1.15  
    1.16 -                    aliased_name = path, name_ref.original_name, name_ref.attrnames, name_ref.number
    1.17 +                aliased_name = path, name_ref.original_name, name_ref.attrnames, name_ref.number
    1.18  
    1.19                  return None, aliased_name
    1.20  
    1.21 @@ -351,13 +350,12 @@
    1.22              # cannot be resolved, but they may be resolvable later.
    1.23  
    1.24              if not ref:
    1.25 -                if not invocation:
    1.26  
    1.27 -                    # Record the path used for tracking purposes
    1.28 -                    # alongside original name, attribute and access
    1.29 -                    # number details.
    1.30 +                # Record the path used for tracking purposes
    1.31 +                # alongside original name, attribute and access
    1.32 +                # number details.
    1.33  
    1.34 -                    aliased_name = path, name_ref.name, None, name_ref.number
    1.35 +                aliased_name = path, name_ref.name, None, name_ref.number
    1.36  
    1.37                  return None, aliased_name
    1.38