Test fixes.

Cython/Compiler/Builtin.py

@@ -210,7 +210,7 @@ builtin_function_table = [
     BuiltinFunction('__Pyx_PyObject_Append', "OO",  "O",     "__Pyx_PyObject_Append"),
 
     # This is conditionally looked up based on a compiler directive.
-    BuiltinFunction('__Pyx_globals',    "",     "O",     "__Pyx_Globals",
+    BuiltinFunction('__Pyx_Globals',    "",     "O",     "__Pyx_Globals",
                     utility_code=globals_utility_code),
 ]
 

Cython/Compiler/Options.py

@@ -415,7 +415,7 @@ def parse_directive_list(s, relaxed_bool=False, ignore_unknown=False,
             found = False
             if name.endswith('.all'):
                 prefix = name[:-3]
-                for directive in directive_defaults:
+                for directive in _directive_defaults:
                     if directive.startswith(prefix):
                         found = True
                         parsed_value = parse_directive_value(directive, value, relaxed_bool=relaxed_bool)

Cython/Compiler/Symtab.py

@@ -1130,7 +1130,7 @@ class ModuleScope(Scope):
                 if entry.name == name:
                     return entry
         if name == 'globals' and not self.old_style_globals:
-            return self.outer_scope.lookup('__Pyx_globals')
+            return self.outer_scope.lookup('__Pyx_Globals')
         else:
             entry = self.declare(None, None, py_object_type, pos, 'private')
         if Options.cache_builtins and name not in Code.uncachable_builtins:

tests/run/line_profile_test.srctree

@@ -7,9 +7,9 @@ from distutils.extension import Extension
 from distutils.core import setup
 from Cython.Build import cythonize
 
-from Cython.Compiler.Options import directive_defaults
-directive_defaults['linetrace'] = True
-directive_defaults['binding'] = True
+from Cython.Compiler.Options import _directive_defaults
+_directive_defaults['linetrace'] = True
+_directive_defaults['binding'] = True
 
 extensions = [
     Extension("collatz", ["collatz.pyx"], define_macros=[('CYTHON_TRACE', '1')])