# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1489338205 -3600
# Node ID 8453ca48a9802964db68ee2e1c42e2e602324954
# Parent  0c0c79505672a42719bde04ab70b2196ade22d55
Added missing changes from the recent merge.

diff -r 0c0c79505672 -r 8453ca48a980 resolving.py
--- a/resolving.py	Sun Mar 12 17:58:14 2017 +0100
+++ b/resolving.py	Sun Mar 12 18:03:25 2017 +0100
@@ -331,13 +331,12 @@
             # but they may be resolvable later.
 
             if not ref:
-                if not invocation:
 
-                    # Record the path used for tracking purposes
-                    # alongside original name, attribute and access
-                    # number details.
+                # Record the path used for tracking purposes
+                # alongside original name, attribute and access
+                # number details.
 
-                    aliased_name = path, name_ref.original_name, name_ref.attrnames, name_ref.number
+                aliased_name = path, name_ref.original_name, name_ref.attrnames, name_ref.number
 
                 return None, aliased_name
 
@@ -351,13 +350,12 @@
             # cannot be resolved, but they may be resolvable later.
 
             if not ref:
-                if not invocation:
 
-                    # Record the path used for tracking purposes
-                    # alongside original name, attribute and access
-                    # number details.
+                # Record the path used for tracking purposes
+                # alongside original name, attribute and access
+                # number details.
 
-                    aliased_name = path, name_ref.name, None, name_ref.number
+                aliased_name = path, name_ref.name, None, name_ref.number
 
                 return None, aliased_name