# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1487591974 -3600
# Node ID e6d60706c5a0bdbda353149e901777f54922a091
# Parent  d11ceeafd2d79c111074d549ec06fb1bb75504fc# Parent  b12c85bb0a4ca52b15afa26dfba10eefcf094e1e
Merged changes from the default branch.

diff -r d11ceeafd2d7 -r e6d60706c5a0 common.py
--- a/common.py	Mon Feb 20 00:35:33 2017 +0100
+++ b/common.py	Mon Feb 20 12:59:34 2017 +0100
@@ -749,8 +749,7 @@
 
         If the name is being used outside a function, and if 'name_ref' is
         given, a path featuring the name in the global namespace is returned
-        where 'name_ref' indicates a global, or a static reference is used if
-        'name_ref' provides such a reference. Otherwise, a path computed using
+        where 'name_ref' indicates a global. Otherwise, a path computed using
         the current namespace and the given name is returned.
 
         The intention of this method is to provide a suitably-qualified name
@@ -769,11 +768,6 @@
         if self.in_function:
             return name
 
-        # For static references, use the reference origin.
-
-        elif name_ref and name_ref.final():
-            return name_ref.final()
-
         # For global names outside functions, use a global name.
 
         elif name_ref and name_ref.is_global_name():