From: Dag Sverre Seljebotn <dagss@student.matnat.uio.no>
Date: Thu, 25 Jun 2009 18:16:32 +0000 (+0200)
Subject: merge
X-Git-Tag: 0.12.alpha0~286
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=daa3f7f7ae1de6bfa5ef6cc6ace38d35f14c3f8d;p=cython.git

merge
---

daa3f7f7ae1de6bfa5ef6cc6ace38d35f14c3f8d
diff --cc Cython/Compiler/ModuleNode.py
index bc8e41c4,c400499f..be9a8dd4
--- a/Cython/Compiler/ModuleNode.py
+++ b/Cython/Compiler/ModuleNode.py
@@@ -573,9 -580,14 +573,7 @@@ class ModuleNode(Nodes.Node, Nodes.Bloc
          code.putln('static const char * %s= %s;' % (Naming.cfilenm_cname, Naming.file_c_macro))
          code.putln('static const char *%s;' % Naming.filename_cname)
          code.putln('static const char **%s;' % Naming.filetable_cname)
 -        if env.doc:
 -            docstr = env.doc
 -            if not isinstance(docstr, str):
 -                docstr = docstr.utf8encode()
 -            code.putln('')
 -            code.putln('static char %s[] = "%s";' % (
 -                    env.doc_cname, escape_byte_string(docstr)))
  
-         env.use_utility_code(streq_utility_code)
- 
          # XXX this is a mess
          for utility_code in PyrexTypes.c_int_from_py_function.specialize_list:
              env.use_utility_code(utility_code)