Mailman 3 October 2008 - Python-checkins

r67030 - in python/trunk: Lib/test/test_future.py Misc/NEWS Parser/parser.c
by benjamin.peterson Oct. 26, 2008

Oct. 26, 2008

Author: benjamin.peterson Date: Sun Oct 26 21:21:13 2008 New Revision: 67030 Log: fix __future__ imports when multiple features are given Modified: python/trunk/Lib/test/test_future.py python/trunk/Misc/NEWS python/trunk/Parser/parser.c Modified: python/trunk/Lib/test/test_future.py ============================================================================== --- python/trunk/Lib/test/test_future.py (original) +++ python/trunk/Lib/test/test_future.py Sun Oct 26 21:21:13 2008 @@ -89,19 +89,23 @@ # the parser hack disabled. If a new keyword is introduced in # 2.6, change this to refer to the new future import. try: - exec "from __future__ import division, with_statement; with = 0" + exec "from __future__ import print_function; print 0" except SyntaxError: pass else: self.fail("syntax error didn't occur") try: - exec "from __future__ import (with_statement, division); with = 0" + exec "from __future__ import (print_function); print 0" except SyntaxError: pass else: self.fail("syntax error didn't occur") + def test_multiple_features(self): + test_support.unload("test.test_future5") + from test import test_future5 + def test_main(): test_support.run_unittest(FutureTest) Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Sun Oct 26 21:21:13 2008 @@ -12,6 +12,9 @@ Core and Builtins ----------------- +- Issue #4209: Enabling unicode_literals and the print_function in the same + __future__ import didn't work. + - Using ``nonlocal`` as a variable name will now raise a Py3k SyntaxWarning because it is a reserved word in 3.x. Modified: python/trunk/Parser/parser.c ============================================================================== --- python/trunk/Parser/parser.c (original) +++ python/trunk/Parser/parser.c Sun Oct 26 21:21:13 2008 @@ -206,13 +206,10 @@ char *str_ch = STR(CHILD(cch, 0)); if (strcmp(str_ch, FUTURE_WITH_STATEMENT) == 0) { ps->p_flags |= CO_FUTURE_WITH_STATEMENT; - break; } else if (strcmp(str_ch, FUTURE_PRINT_FUNCTION) == 0) { ps->p_flags |= CO_FUTURE_PRINT_FUNCTION; - break; } else if (strcmp(str_ch, FUTURE_UNICODE_LITERALS) == 0) { ps->p_flags |= CO_FUTURE_UNICODE_LITERALS; - break; } } }

1 0

Python Regression Test Failures doc dist (1)
by Neal Norwitz Oct. 26, 2008

Oct. 26, 2008

rm -rf dist mkdir -p dist # archive the HTML make html make[1]: Entering directory `/home/neal/python/r26/Doc' mkdir -p build/html build/doctrees python tools/sphinx-build.py -b html -d build/doctrees -D latex_paper_size= . build/html Sphinx v0.5, building html loading pickled environment... done building [html]: targets for 0 source files that are out of date updating environment: 0 added, 0 changed, 0 removed no targets are out of date. Build finished. The HTML pages are in build/html. make[1]: Leaving directory `/home/neal/python/r26/Doc' cp -pPR build/html dist/python-docs-html tar -C dist -cf dist/python-docs-html.tar python-docs-html bzip2 -9 -k dist/python-docs-html.tar (cd dist; zip -q -r -9 python-docs-html.zip python-docs-html) rm -r dist/python-docs-html rm dist/python-docs-html.tar # archive the text build make text make[1]: Entering directory `/home/neal/python/r26/Doc' mkdir -p build/text build/doctrees python tools/sphinx-build.py -b text -d build/doctrees -D latex_paper_size= . build/text Sphinx v0.5, building text loading pickled environment... done building [text]: targets for 0 source files that are out of date updating environment: 0 added, 0 changed, 0 removed no targets are out of date. Build finished; the text files are in build/text. make[1]: Leaving directory `/home/neal/python/r26/Doc' cp -pPR build/text dist/python-docs-text tar -C dist -cf dist/python-docs-text.tar python-docs-text bzip2 -9 -k dist/python-docs-text.tar (cd dist; zip -q -r -9 python-docs-text.zip python-docs-text) rm -r dist/python-docs-text rm dist/python-docs-text.tar # archive the A4 latex rm -r build/latex make latex PAPER=a4 make[1]: Entering directory `/home/neal/python/r26/Doc' mkdir -p build/latex build/doctrees python tools/sphinx-build.py -b latex -d build/doctrees -D latex_paper_size=a4 . build/latex Sphinx v0.5, building latex loading pickled environment... done building [latex]: all documents updating environment: 0 added, 0 changed, 0 removed processing c-api.tex... c-api/index c-api/intro c-api/veryhigh c-api/refcounting c-api/exceptions c-api/utilities c-api/sys c-api/import c-api/marshal c-api/arg c-api/conversion c-api/reflection c-api/abstract c-api/object c-api/number c-api/sequence c-api/mapping c-api/iter c-api/objbuffer c-api/concrete c-api/type c-api/none c-api/int c-api/bool c-api/long c-api/float c-api/complex c-api/bytearray c-api/string c-api/unicode c-api/buffer c-api/tuple c-api/list c-api/dict c-api/class c-api/function c-api/method c-api/file c-api/module c-api/iterator c-api/descriptor c-api/slice c-api/weakref c-api/cobject c-api/cell c-api/gen c-api/datetime c-api/set c-api/init c-api/memory c-api/objimpl c-api/allocation c-api/structures c-api/typeobj c-api/gcsupport resolving references... writing... done processing distutils.tex... distutils/index distutils/introduction distutils/setupscript distutils/configfile distutils/sourcedist distutils/builtdist distutils/packageindex distutils/uploading distutils/examples distutils/extending distutils/commandref distutils/apiref resolving references... writing... done processing documenting.tex... documenting/index documenting/intro documenting/style documenting/rest documenting/markup documenting/fromlatex documenting/sphinx resolving references... writing... done processing extending.tex... extending/index extending/extending extending/newtypes extending/building extending/windows extending/embedding resolving references... writing... done processing install.tex... install/index resolving references... writing... done processing library.tex... library/index library/intro library/functions library/constants library/objects library/stdtypes library/exceptions library/strings library/string library/re library/struct library/difflib library/stringio library/textwrap library/codecs library/unicodedata library/stringprep library/fpformat library/datatypes library/datetime library/calendar library/collections library/heapq library/bisect library/array library/sets library/sched library/mutex library/queue library/weakref library/userdict library/types library/new library/copy library/pprint library/repr library/numeric library/numbers library/math library/cmath library/decimal library/fractions library/random library/itertools library/functools library/operator library/filesys library/os.path library/fileinput library/stat library/statvfs library/filecmp library/tempfile library/glob library/fnmatch library/linecache library/shutil library/dircache library/macpath library/persistence library/pickle library/copy_reg library/shelve library/marshal library/anydbm library/whichdb library/dbm library/gdbm library/dbhash library/bsddb library/dumbdbm library/sqlite3 library/archiving library/zlib library/gzip library/bz2 library/zipfile library/tarfile library/fileformats library/csv library/configparser library/robotparser library/netrc library/xdrlib library/plistlib library/crypto library/hashlib library/hmac library/md5 library/sha library/allos library/os library/io library/time library/optparse library/getopt library/logging library/getpass library/curses library/curses.ascii library/curses.panel library/platform library/errno library/ctypes library/someos library/select library/threading library/thread library/dummy_threading library/dummy_thread library/multiprocessing library/mmap library/readline library/rlcompleter library/ipc library/subprocess library/socket library/ssl library/signal library/popen2 library/asyncore library/asynchat library/netdata library/email library/email.message library/email.parser library/email.generator library/email.mime library/email.header library/email.charset library/email.encoders library/email.errors library/email.util library/email.iterators library/email-examples library/json library/mailcap library/mailbox library/mhlib library/mimetools library/mimetypes library/mimewriter library/mimify library/multifile library/rfc822 library/base64 library/binhex library/binascii library/quopri library/uu library/markup library/htmlparser library/sgmllib library/htmllib library/pyexpat library/xml.dom library/xml.dom.minidom library/xml.dom.pulldom library/xml.sax library/xml.sax.handler library/xml.sax.utils library/xml.sax.reader library/xml.etree.elementtree library/internet library/webbrowser library/cgi library/cgitb library/wsgiref library/urllib library/urllib2 library/httplib library/ftplib library/poplib library/imaplib library/nntplib library/smtplib library/smtpd library/telnetlib library/uuid library/urlparse library/socketserver library/basehttpserver library/simplehttpserver library/cgihttpserver library/cookielib library/cookie library/xmlrpclib library/simplexmlrpcserver library/docxmlrpcserver library/mm library/audioop library/imageop library/aifc library/sunau library/wave library/chunk library/colorsys library/imghdr library/sndhdr library/ossaudiodev library/i18n library/gettext library/locale library/frameworks library/cmd library/shlex library/tk library/tkinter library/tix library/scrolledtext library/turtle library/idle library/othergui library/development library/pydoc library/doctest library/unittest library/2to3 library/test library/debug library/bdb library/pdb library/profile library/hotshot library/timeit library/trace library/python library/sys library/__builtin__ library/future_builtins library/__main__ library/warnings library/contextlib library/abc library/atexit library/traceback library/__future__ library/gc library/inspect library/site library/user library/fpectl library/custominterp library/code library/codeop library/restricted library/rexec library/bastion library/modules library/imp library/imputil library/zipimport library/pkgutil library/modulefinder library/runpy library/language library/parser library/ast library/symtable library/symbol library/token library/keyword library/tokenize library/tabnanny library/pyclbr library/py_compile library/compileall library/dis library/pickletools library/distutils library/compiler library/misc library/formatter library/windows library/msilib library/msvcrt library/_winreg library/winsound library/unix library/posix library/pwd library/spwd library/grp library/crypt library/dl library/termios library/tty library/pty library/fcntl library/pipes library/posixfile library/resource library/nis library/syslog library/commands library/mac library/ic library/macos library/macostools library/easydialogs library/framework library/autogil library/carbon library/colorpicker library/macosa library/gensuitemodule library/aetools library/aepack library/aetypes library/miniaeframe library/sgi library/al library/cd library/fl library/fm library/gl library/imgfile library/jpeg library/sun library/sunaudio library/undoc resolving references... writing... done processing reference.tex... reference/index reference/introduction reference/lexical_analysis reference/datamodel reference/executionmodel reference/expressions reference/simple_stmts reference/compound_stmts reference/toplevel_components reference/grammar resolving references... writing... done processing tutorial.tex... tutorial/index tutorial/appetite tutorial/interpreter tutorial/introduction tutorial/controlflow tutorial/datastructures tutorial/modules tutorial/inputoutput tutorial/errors tutorial/classes tutorial/stdlib tutorial/stdlib2 tutorial/whatnow tutorial/interactive tutorial/floatingpoint resolving references... writing... done processing using.tex... using/index using/cmdline using/unix using/windows using/mac resolving references... writing... done processing whatsnew.tex... whatsnew/2.6 resolving references... writing... done processing howto-doanddont.tex... howto/doanddont resolving references... writing... done processing howto-advocacy.tex... howto/advocacy resolving references... writing... done processing howto-functional.tex... howto/functional resolving references... writing... done processing howto-regex.tex... howto/regex resolving references... writing... done processing howto-sockets.tex... howto/sockets resolving references... writing... done processing howto-urllib2.tex... howto/urllib2 resolving references... writing... done processing howto-webservers.tex... howto/webservers resolving references... writing... done processing howto-curses.tex... howto/curses resolving references... writing... done processing howto-cporting.tex... howto/cporting resolving references... writing... done processing howto-unicode.tex... howto/unicode resolving references... writing... done copying TeX support files... done build succeeded. Build finished; the LaTeX files are in build/latex. Run `make all-pdf' or `make all-ps' in that directory to run these through (pdf)latex. make[1]: Leaving directory `/home/neal/python/r26/Doc' (cd build/latex; make clean && make all-pdf && make FMT=pdf zip bz2) make[1]: Entering directory `/home/neal/python/r26/Doc/build/latex' rm -f *.pdf *.dvi *.ps rm -f *.log *.ind *.aux *.toc *.syn *.idx *.out *.ilg *.pla make[1]: Leaving directory `/home/neal/python/r26/Doc/build/latex' make[1]: Entering directory `/home/neal/python/r26/Doc/build/latex' pdflatex 'c-api.tex' This is pdfTeX, Version 3.14159-1.10b (Web2C 7.4.5) (./c-api.tex{/usr/share/texmf/pdftex/config/pdftex.cfg} LaTeX2e <2001/06/01> Babel <v3.7h> and hyphenation patterns for american, french, german, ngerman, n ohyphenation, loaded. (./manual.cls Document Class: manual 2008/10/18 Document class (Sphinx manual) (/usr/share/texmf/tex/latex/base/report.cls Document Class: report 2001/04/21 v1.4e Standard LaTeX document class (/usr/share/texmf/tex/latex/base/size10.clo))) (/usr/share/texmf/tex/latex/base/inputenc.sty (/usr/share/texmf/tex/latex/base/utf8.def)) (/usr/share/texmf/tex/latex/base/fontenc.sty (/usr/share/texmf/tex/latex/base/t1enc.def)) (/usr/share/texmf/tex/generic/babel/babel.sty (/usr/share/texmf/tex/generic/babel/english.ldf (/usr/share/texmf/tex/generic/babel/babel.def))) (/usr/share/texmf/tex/latex/psnfss/times.sty) (./fncychap.sty) (./sphinx.sty (/usr/share/texmf/tex/latex/base/textcomp.sty (/usr/share/texmf/tex/latex/base/ts1enc.def)) (/usr/share/texmf/tex/latex/fancyhdr/fancyhdr.sty) (/usr/share/texmf/tex/latex/misc/fancybox.sty Style option: `fancybox' v1.3 <2000/09/19> (tvz) ) (/usr/share/texmf/tex/latex/titlesec/titlesec.sty) (./tabulary.sty (/usr/share/texmf/tex/latex/tools/array.sty)) (/usr/share/texmf/tex/latex/amsmath/amsmath.sty For additional information on amsmath, use the `?' option. (/usr/share/texmf/tex/latex/amsmath/amstext.sty (/usr/share/texmf/tex/latex/amsmath/amsgen.sty)) (/usr/share/texmf/tex/latex/amsmath/amsbsy.sty) (/usr/share/texmf/tex/latex/amsmath/amsopn.sty)) (/usr/share/texmf/tex/latex/base/makeidx.sty) (/usr/share/texmf/tex/latex/misc/framed.sty) (/usr/share/texmf/tex/latex/graphics/color.sty (/usr/share/texmf/tex/latex/config/color.cfg) (/usr/share/texmf/tex/latex/graphics/pdftex.def)) (/usr/share/texmf/tex/latex/fancyvrb/fancyvrb.sty Style option: `fancyvrb' v2.7, with DG/SPQR fixes <2000/03/21> (tvz) (/usr/share/texmf/tex/latex/graphics/keyval.sty)) (/usr/share/texmf/tex/latex/graphics/graphicx.sty (/usr/share/texmf/tex/latex/graphics/graphics.sty (/usr/share/texmf/tex/latex/graphics/trig.sty) (/usr/share/texmf/tex/latex/config/graphics.cfg))) (/usr/share/texmf/pdftex/plain/misc/pdfcolor.tex) ! Extra \fi. l.62 \fi\fi ? ! Emergency stop. l.62 \fi\fi No pages of output. Transcript written on c-api.log. make[1]: *** [c-api.pdf] Error 1 make[1]: Leaving directory `/home/neal/python/r26/Doc/build/latex' make: *** [dist] Error 2

1 0

buildbot failure in ia64 Ubuntu 3.0
by buildbot＠python.org Oct. 26, 2008

Oct. 26, 2008

The Buildbot has detected a new failure of ia64 Ubuntu 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/ia64%20Ubuntu%203.0/builds/682 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: klose-debian-ia64 Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: benjamin.peterson BUILD FAILED: failed test Excerpt from the test logfile: sincerely, -The Buildbot

1 0

buildbot failure in sparc solaris10 gcc trunk
by buildbot＠python.org Oct. 26, 2008

Oct. 26, 2008

The Buildbot has detected a new failure of sparc solaris10 gcc trunk. Full details are available at: http://www.python.org/dev/buildbot/all/sparc%20solaris10%20gcc%20trunk/buil… Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: loewis-sun Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: benjamin.peterson,georg.brandl BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_zipimport ====================================================================== FAIL: testBoth (test.test_zipimport.UncompressedZipImportTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home2/buildbot/slave/trunk.loewis-sun/build/Lib/test/test_zipimport.py", line 148, in testBoth self.doTest(pyc_ext, files, TESTMOD) File "/home2/buildbot/slave/trunk.loewis-sun/build/Lib/test/test_zipimport.py", line 100, in doTest *modules) + expected_ext) AssertionError: '/home2/buildbot/slave/trunk.loewis-sun/build/junk95142.zip/ziptestmodule.py' != '/home2/buildbot/slave/trunk.loewis-sun/build/junk95142.zip/ziptestmodule.pyc' ====================================================================== FAIL: testGetCompiledSource (test.test_zipimport.UncompressedZipImportTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home2/buildbot/slave/trunk.loewis-sun/build/Lib/test/test_zipimport.py", line 311, in testGetCompiledSource self.doTest(pyc_ext, files, TESTMOD, call=self.assertModuleSource) File "/home2/buildbot/slave/trunk.loewis-sun/build/Lib/test/test_zipimport.py", line 100, in doTest *modules) + expected_ext) AssertionError: '/home2/buildbot/slave/trunk.loewis-sun/build/junk95142.zip/ziptestmodule.py' != '/home2/buildbot/slave/trunk.loewis-sun/build/junk95142.zip/ziptestmodule.pyc' ====================================================================== FAIL: testAFakeZlib (test.test_zipimport.CompressedZipImportTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home2/buildbot/slave/trunk.loewis-sun/build/Lib/test/test_zipimport.py", line 135, in testAFakeZlib self.fail("expected test to raise ImportError") AssertionError: expected test to raise ImportError ====================================================================== FAIL: testBoth (test.test_zipimport.CompressedZipImportTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home2/buildbot/slave/trunk.loewis-sun/build/Lib/test/test_zipimport.py", line 148, in testBoth self.doTest(pyc_ext, files, TESTMOD) File "/home2/buildbot/slave/trunk.loewis-sun/build/Lib/test/test_zipimport.py", line 100, in doTest *modules) + expected_ext) AssertionError: '/home2/buildbot/slave/trunk.loewis-sun/build/junk95142.zip/ziptestmodule.py' != '/home2/buildbot/slave/trunk.loewis-sun/build/junk95142.zip/ziptestmodule.pyc' ====================================================================== FAIL: testGetCompiledSource (test.test_zipimport.CompressedZipImportTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home2/buildbot/slave/trunk.loewis-sun/build/Lib/test/test_zipimport.py", line 311, in testGetCompiledSource self.doTest(pyc_ext, files, TESTMOD, call=self.assertModuleSource) File "/home2/buildbot/slave/trunk.loewis-sun/build/Lib/test/test_zipimport.py", line 100, in doTest *modules) + expected_ext) AssertionError: '/home2/buildbot/slave/trunk.loewis-sun/build/junk95142.zip/ziptestmodule.py' != '/home2/buildbot/slave/trunk.loewis-sun/build/junk95142.zip/ziptestmodule.pyc' sincerely, -The Buildbot

1 0

buildbot failure in x86 osx.5 trunk
by buildbot＠python.org Oct. 26, 2008

Oct. 26, 2008

The Buildbot has detected a new failure of x86 osx.5 trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20osx.5%20trunk/builds/295 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: heller-x86-osx5 Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: benjamin.peterson,georg.brandl BUILD FAILED: failed test Excerpt from the test logfile: sincerely, -The Buildbot

1 0

r67028 - python/trunk/Tools/scripts/findnocoding.py
by benjamin.peterson Oct. 25, 2008

Oct. 25, 2008

Author: benjamin.peterson Date: Sun Oct 26 01:27:07 2008 New Revision: 67028 Log: don't use a catch-all Modified: python/trunk/Tools/scripts/findnocoding.py Modified: python/trunk/Tools/scripts/findnocoding.py ============================================================================== --- python/trunk/Tools/scripts/findnocoding.py (original) +++ python/trunk/Tools/scripts/findnocoding.py Sun Oct 26 01:27:07 2008 @@ -12,7 +12,7 @@ # our pysource module finds Python source files try: import pysource -except: +except ImportError: # emulate the module with a simple os.walk class pysource: has_python_ext = looks_like_python = can_be_compiled = None

1 0

buildbot failure in alpha Debian 3.0
by buildbot＠python.org Oct. 25, 2008

Oct. 25, 2008

The Buildbot has detected a new failure of alpha Debian 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/alpha%20Debian%203.0/builds/12 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: klose-debian-alpha Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: alexandre.vassalotti,benjamin.peterson BUILD FAILED: failed compile sincerely, -The Buildbot

1 0

buildbot failure in sparc solaris10 gcc 3.0
by buildbot＠python.org Oct. 25, 2008

Oct. 25, 2008

The Buildbot has detected a new failure of sparc solaris10 gcc 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/sparc%20solaris10%20gcc%203.0/builds… Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: loewis-sun Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: alexandre.vassalotti BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_posix ====================================================================== ERROR: test_getcwd_long_pathnames (test.test_posix.PosixTester) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home2/buildbot/slave/3.0.loewis-sun/build/Lib/test/test_posix.py", line 252, in test_getcwd_long_pathnames support.rmtree(base_path) File "/home2/buildbot/slave/3.0.loewis-sun/build/Lib/test/support.py", line 98, in rmtree shutil.rmtree(path) File "/home2/buildbot/slave/3.0.loewis-sun/build/Lib/shutil.py", line 225, in rmtree onerror(os.rmdir, path, sys.exc_info()) File "/home2/buildbot/slave/3.0.loewis-sun/build/Lib/shutil.py", line 223, in rmtree os.rmdir(path) OSError: [Errno 22] Invalid argument: '/home2/buildbot/slave/3.0.loewis-sun/build/@test.getcwd/@test.getcwd' sincerely, -The Buildbot

1 0

buildbot failure in sparc Ubuntu 3.0
by buildbot＠python.org Oct. 25, 2008

Oct. 25, 2008

The Buildbot has detected a new failure of sparc Ubuntu 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/sparc%20Ubuntu%203.0/builds/716 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: klose-ubuntu-sparc Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: benjamin.peterson BUILD FAILED: failed test Excerpt from the test logfile: sincerely, -The Buildbot

1 0

r67025 - in doctools/trunk: CHANGES doc/rest.rst sphinx/environment.py
by georg.brandl Oct. 25, 2008

Oct. 25, 2008

Author: georg.brandl Date: Sat Oct 25 18:53:29 2008 New Revision: 67025 Log: Don't disable alphabetical and roman lists anymore. Modified: doctools/trunk/CHANGES doctools/trunk/doc/rest.rst doctools/trunk/sphinx/environment.py Modified: doctools/trunk/CHANGES ============================================================================== --- doctools/trunk/CHANGES (original) +++ doctools/trunk/CHANGES Sat Oct 25 18:53:29 2008 @@ -25,6 +25,9 @@ - Added ``cmember`` role for consistency. + - Lists enumerated by letters or roman numerals are now handled like in + standard reST. + * HTML output and templates: - Incompatible change: The "root" relation link (top left in the Modified: doctools/trunk/doc/rest.rst ============================================================================== --- doctools/trunk/doc/rest.rst (original) +++ doctools/trunk/doc/rest.rst Sat Oct 25 18:53:29 2008 @@ -67,12 +67,6 @@ #. This is a numbered list. #. It has two items too. -Note that Sphinx disables the use of enumerated lists introduced by alphabetic -or roman numerals, such as :: - - A. First item - B. Second item - Nested lists are possible, but be aware that they must be separated from the parent list items by blank lines:: Modified: doctools/trunk/sphinx/environment.py ============================================================================== --- doctools/trunk/sphinx/environment.py (original) +++ doctools/trunk/sphinx/environment.py Sat Oct 25 18:53:29 2008 @@ -41,13 +41,6 @@ from docutils.transforms import Transform from docutils.transforms.parts import ContentsFilter -# monkey-patch reST parser to disable alphabetic and roman enumerated lists -from docutils.parsers.rst.states import Body -Body.enum.converters['loweralpha'] = \ - Body.enum.converters['upperalpha'] = \ - Body.enum.converters['lowerroman'] = \ - Body.enum.converters['upperroman'] = lambda x: None - from sphinx import addnodes from sphinx.util import get_matching_docs, SEP from sphinx.directives import additional_xref_types

1 0