merged in latest cython-devel

4e46d6ae · Stefan Behnel · 3cadad3c · b1a0e894 · 4e46d6ae
Commit 4e46d6ae authored May 12, 2010 by Stefan Behnel
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

Cython/Compiler/ExprNodes.py Cython/Compiler/ExprNodes.py +3 -2

No files found.
--- a/Cython/Compiler/ExprNodes.py
+++ b/Cython/Compiler/ExprNodes.py
@@ -6651,8 +6651,9 @@ class DocstringRefNode(ExprNode):
        pass
    def generate_result_code(self, code):
-        code.putln('%s = __Pyx_GetAttrString(%s, "__doc__");' %
+        code.putln('%s = __Pyx_GetAttrString(%s, "__doc__"); %s' % (
-                   (self.result(), self.body.result()))
+            self.result(), self.body.result(),
+            code.error_goto_if_null(self.result(), self.pos)))
        code.put_gotref(self.result())