merged in latest cython-unstable

Cython/Compiler/ModuleNode.py

@@ -1811,12 +1811,12 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
                 Naming.builtins_cname,
                 code.error_goto(self.pos)))
         if Options.embed:
-            __main__cname = code.globalstate.get_py_string_const(
+            __main__name = code.globalstate.get_py_string_const(
                 EncodedString("__main__"), identifier=True)
             code.putln(
                 'if (__Pyx_SetAttrString(%s, "__name__", %s) < 0) %s;' % (
                     env.module_cname,
-                    __main__cname,
+                    __main__name.cname,
                     code.error_goto(self.pos)))
         if Options.pre_import is not None:
             code.putln(

Cython/Compiler/Parsing.py

@@ -1614,6 +1614,9 @@ def p_statement(s, ctx, first_statement = 0):
         decorators = p_decorators(s)
         if s.sy not in ('def', 'cdef', 'cpdef'):
             s.error("Decorators can only be followed by functions ")
+    elif s.sy == 'pass' and cdef_flag:
+        # empty cdef block
+        return p_pass_statement(s, with_newline = 1)
 
     overridable = 0
     if s.sy == 'cdef':

Cython/Compiler/PyrexTypes.py

@@ -275,8 +275,14 @@ class BuiltinObjectType(PyObjectType):
     base_type = None
     module_name = '__builtin__'
 
+    alternative_name = None # used for str/bytes duality
+
     def __init__(self, name, cname):
         self.name = name
+        if name == 'str':
+            self.alternative_name = 'bytes'
+        elif name == 'bytes':
+            self.alternative_name = 'str'
         self.cname = cname
         self.typeptr_cname = "&" + cname
                                  
@@ -293,7 +299,9 @@ class BuiltinObjectType(PyObjectType):
         
     def assignable_from(self, src_type):
         if isinstance(src_type, BuiltinObjectType):
-            return src_type.name == self.name
+            return src_type.name == self.name or (
+                src_type.name == self.alternative_name and
+                src_type.name is not None)
         else:
             return not src_type.is_extension_type