Fix TypeError bug.

The Binding.used property must be a tuple (unless it's False).

2 files changed, 10 insertions, 1 deletions

diff --git a/pyflakes/checker.py b/pyflakes/checker.py
index de7c6f8..fcdce9c 100644
--- a/pyflakes/checker.py
+++ b/pyflakes/checker.py
@@ -699,7 +699,7 @@ class Checker(object):
                 global_scope.setdefault(node_name, node_value)
 
                 # Bind name to non-global scopes, but as already "used".
-                node_value.used = True
+                node_value.used = (global_scope, node)
                 for scope in self.scopeStack[global_scope_index + 1:]:
                     scope[node_name] = node_value
 
diff --git a/pyflakes/test/test_other.py b/pyflakes/test/test_other.py
index 6e5950e..ac116c8 100644
--- a/pyflakes/test/test_other.py
+++ b/pyflakes/test/test_other.py
@@ -476,6 +476,15 @@ class Test(TestCase):
         foo.bar += foo.baz
         ''')
 
+    def test_globalDeclaredInDifferentScope(self):
+        """
+        A 'global' can be declared in one scope and reused in another.
+        """
+        self.flakes('''
+        def f(): global foo
+        def g(): foo = 'anything'; foo.is_used()
+        ''')
+
 
 class TestUnusedAssignment(TestCase):
     """