jython
diff --git a/‎Lib/test/test_descr.py‎
Lines changed: 0 additions & 3 deletions b/‎Lib/test/test_descr.py‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎Misc/make_pydocs.py‎
Lines changed: 13 additions & 7 deletions b/‎Misc/make_pydocs.py‎
Lines changed: 13 additions & 7 deletions
@@ -4396,9 +4396,6 @@ def test_main():
             # takes 1 arg)
             specials,
 
-            # Jython file lacks doc strings
-            descrdoc,
-
             # New style classes don't support __del__:
             # http://bugs.jython.org/issue1057
             delhook,
 
@@ -2,15 +2,21 @@
 import __builtin__
 
 def print_doc(out, obj, meth):
-    doc = (getattr(obj, meth)).__doc__
-    if doc == None:
+    if meth == '__doc__':
+        doc = getattr(obj, meth)
+        bdname = '%s_doc' % obj.__name__
+    else:
+        doc = getattr(obj, meth).__doc__
+        bdname = '%s_%s_doc' % (obj.__name__, meth)
+
+    if doc is None:
         doc = ""
     lines = doc.split("\n")
-    outstring = '\\n" + \n        "'.join(lines)
-    print >> out, ('    public final static String %s_%s_doc = '
-        % (obj.__name__, meth))
+    outstring = '\\n" + \n        "'.join(format(line) for line in lines)
+    print >> out, ('    public final static String %s = ' % bdname)
     print >> outfile,  '        "%s";\n' % outstring
 
+format = lambda line: line.replace('\\', '\\\\').replace('"', r'\"')
 opt = lambda n: getattr(__builtin__, n, None)
 
 def f(): pass
@@ -58,13 +64,13 @@ class C:
 ]
 
 outfile = open("BuiltinDocs.java", "w")
-print >> outfile, '//generated by make_pydocs.py\n'
+print >> outfile, '// generated by make_pydocs.py\n'
 print >> outfile, 'package org.python.core;\n'
 print >> outfile, 'public class BuiltinDocs {\n'
 
 
 for obj in types_list: 
-    print >> outfile, '    //Docs for %s' % obj
+    print >> outfile, '    // Docs for %s' % obj
     for meth in dir(obj):
         print_doc(outfile, obj, meth)