Merge https://github.com/cython/cython

diff --cc Cython/Compiler/Main.py
index 1f1939ce543823555365c805eb7be7d72ed1e873,f27a81db476febf576c1f7fad28ece880e5194e2..9349cf86a7e7fd5690ec9e93e1511cbd5f669430
--- 1/Cython/Compiler/Main.py
--- 2/Cython/Compiler/Main.py
+++ b/Cython/Compiler/Main.py
@@@ -72,9 -68,8 +72,8 @@@ class Context(object)
      #  include_directories   [string]
      #  future_directives     [object]
      #  language_level        int     currently 2 or 3 for Python 2/3
 -
 +    
      def __init__(self, include_directories, compiler_directives, cpp=False, language_level=2):
-         #self.modules = {"__builtin__" : BuiltinScope()}
          import Builtin, CythonScope
          self.modules = {"__builtin__" : Builtin.builtin_scope}
          self.modules["cython"] = CythonScope.create_cython_scope(self)
@@@ -595,9 -601,9 +606,9 @@@ def run_pipeline(source, options, full_
  
      # Set up result object
      result = create_default_resultobj(source, options)
 -
 +    
      # Get pipeline
-     if source_desc.filename.endswith(".py"):
+     if source_ext.lower() == '.py':
          pipeline = context.create_py_pipeline(options, result)
      else:
          pipeline = context.create_pyx_pipeline(options, result)