merge 0.22.x branch into master

CHANGES.rst

@@ -5,6 +5,10 @@ Cython Changelog
 Latest changes
 ==============
 
+
+0.22.0 (2015-01-??)
+===================
+
 Features added
 --------------
 
@@ -39,6 +43,12 @@ Bugs fixed
 Other changes
 -------------
 
+* Preliminary support for defining the Cython language with a formal grammar.
+  To try parsing your files against this grammar, use the --formal_grammar directive.
+  Experimental.
+
+* ``_`` is no longer considered a cacheable builtin as it could interfere with gettext.
+
 
 0.21.2 (2014-12-27)
 ===================

Cython/Compiler/Code.py

@@ -50,14 +50,15 @@ non_portable_builtins_map = {
 
 basicsize_builtins_map = {
     # builtins whose type has a different tp_basicsize than sizeof(...)
-    'PyTypeObject' : 'PyHeapTypeObject',
-    }
+    'PyTypeObject': 'PyHeapTypeObject',
+}
 
 uncachable_builtins = [
     # builtin names that cannot be cached because they may or may not
     # be available at import time
     'WindowsError',
-    ]
+    '_',  # e.g. gettext
+]
 
 modifier_output_mapper = {
     'inline': 'CYTHON_INLINE'

Cython/Shadow.py

 # cython.* namespace for pure mode.
-__version__ = "0.22pre"
+__version__ = "0.22.alpha0"
 
 
 # BEGIN shameless copy from Cython/minivect/minitypes.py