# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1489247196 -3600
# Node ID 2e22fd27e941265efe8ba5df3d60040ffff3f240
# Parent  7edcb1489c5857a1624cb77d5953c5bc0dd6ab96# Parent  b37d37d2dd8578031c7c86db5a450642cb0deeaa
Merged slightly differing default branches.

diff -r 7edcb1489c58 -r 2e22fd27e941 translator.py
--- a/translator.py	Sat Mar 11 16:43:23 2017 +0100
+++ b/translator.py	Sat Mar 11 16:46:36 2017 +0100
@@ -1438,7 +1438,7 @@
         # Find any invocation or alias details.
 
         name = self.get_name_for_tracking(n.name, is_global=is_global)
-        location = not expr and self.get_access_location(name)
+        location = not expr and self.get_access_location(name) or None
 
         # Mark any local assignments as volatile in exception blocks.