Merge lp:~divmod-dev/divmod.org/windowserror-builtin into lp:divmod.org

[Jean-Paul Calderone]

Change WindowsError to be treated as one of the magic builtins, so it is never warned as an undefined name.

[Jonathan Jacobs (jjacobs)]

Horribleness magic globals aside, this looks good to merge.

review: Approve

[Tristan Seligmann (mithrandi)]

This renders the comment above the _MAGIC_GLOBALS definition slightly inaccurate; how about appending something like "or are only present on some platforms"?

review: Needs Fixing

[lp:~divmod-dev/divmod.org/windowserror-builtin]

2686. By Jean-Paul Calderone on 2011-12-21

Adjust the comment about _MAGIC_GLOBALS, explaining that it also papers over cross-platform __builtin__ differences.

[Tristan Seligmann (mithrandi)]

Looks good! (sorry for the latency in responding to this, Launchpad doesn't send notifications when a merge proposal's branch is updated, only when comments are made on the MP)

review: Approve

=== modified file 'Pyflakes/pyflakes/checker.py'
--- Pyflakes/pyflakes/checker.py	2011-11-17 16:21:58 +0000
+++ Pyflakes/pyflakes/checker.py	2011-12-21 17:00:33 +0000
@@ -173,8 +173,9 @@
     pass
 
 
-# Globally defined names which are not attributes of the __builtin__ module.
-_MAGIC_GLOBALS = ['__file__', '__builtins__']
+# Globally defined names which are not attributes of the __builtin__ module, or
+# are only present on some platforms.
+_MAGIC_GLOBALS = ['__file__', '__builtins__', 'WindowsError']
 
 
 

=== modified file 'Pyflakes/pyflakes/test/test_undefined_names.py'
--- Pyflakes/pyflakes/test/test_undefined_names.py	2010-04-13 14:53:04 +0000
+++ Pyflakes/pyflakes/test/test_undefined_names.py	2011-12-21 17:00:33 +0000
@@ -27,6 +27,14 @@
         self.flakes('range(10)')
 
 
+    def test_builtinWindowsError(self):
+        """
+        C{WindowsError} is sometimes a builtin name, so no warning is emitted
+        for using it.
+        """
+        self.flakes('WindowsError')
+
+
     def test_magicGlobalsFile(self):
         """
         Use of the C{__file__} magic global should not emit an undefined name