[Lxml-checkins] r51454 - in lxml/trunk: . src/lxml src/lxml/html
scoder at codespeak.net
scoder at codespeak.net
Wed Feb 13 21:48:48 CET 2008
Author: scoder
Date: Wed Feb 13 21:48:48 2008
New Revision: 51454
Removed:
lxml/trunk/src/lxml/htmlbuilder.py
Modified:
lxml/trunk/ (props changed)
lxml/trunk/CHANGES.txt
lxml/trunk/src/lxml/html/builder.py
Log:
r3465 at delle: sbehnel | 2008-02-13 17:21:12 +0100
removed redundant module lxml.htmlbuilder (duplicate of lxml.html.builder)
Modified: lxml/trunk/CHANGES.txt
==============================================================================
--- lxml/trunk/CHANGES.txt (original)
+++ lxml/trunk/CHANGES.txt Wed Feb 13 21:48:48 2008
@@ -14,6 +14,9 @@
Bugs fixed
----------
+* The module ``lxml.html.builder`` was duplicated as
+ ``lxml.htmlbuilder``
+
* Setting an element slice in objectify could insert slice-overlapping
elements at the wrong position.
Modified: lxml/trunk/src/lxml/html/builder.py
==============================================================================
--- lxml/trunk/src/lxml/html/builder.py (original)
+++ lxml/trunk/src/lxml/html/builder.py Wed Feb 13 21:48:48 2008
@@ -1,3 +1,31 @@
+# --------------------------------------------------------------------
+# The ElementTree toolkit is
+#
+# Copyright (c) 1999-2004 by Fredrik Lundh
+#
+# By obtaining, using, and/or copying this software and/or its
+# associated documentation, you agree that you have read, understood,
+# and will comply with the following terms and conditions:
+#
+# Permission to use, copy, modify, and distribute this software and
+# its associated documentation for any purpose and without fee is
+# hereby granted, provided that the above copyright notice appears in
+# all copies, and that both that copyright notice and this permission
+# notice appear in supporting documentation, and that the name of
+# Secret Labs AB or the author not be used in advertising or publicity
+# pertaining to distribution of the software without specific, written
+# prior permission.
+#
+# SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
+# TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT-
+# ABILITY AND FITNESS. IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR
+# BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+# DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+# ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+# OF THIS SOFTWARE.
+# --------------------------------------------------------------------
+
"""
HTML specialisation of ``builder.py`` by Fredrik Lundh
Deleted: /lxml/trunk/src/lxml/htmlbuilder.py
==============================================================================
--- /lxml/trunk/src/lxml/htmlbuilder.py Wed Feb 13 21:48:48 2008
+++ (empty file)
@@ -1,154 +0,0 @@
-#
-# HTML specialisation of ``builder.py`` by Fredrik Lundh
-#
-# --------------------------------------------------------------------
-# The ElementTree toolkit is
-#
-# Copyright (c) 1999-2004 by Fredrik Lundh
-#
-# By obtaining, using, and/or copying this software and/or its
-# associated documentation, you agree that you have read, understood,
-# and will comply with the following terms and conditions:
-#
-# Permission to use, copy, modify, and distribute this software and
-# its associated documentation for any purpose and without fee is
-# hereby granted, provided that the above copyright notice appears in
-# all copies, and that both that copyright notice and this permission
-# notice appear in supporting documentation, and that the name of
-# Secret Labs AB or the author not be used in advertising or publicity
-# pertaining to distribution of the software without specific, written
-# prior permission.
-#
-# SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
-# TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT-
-# ABILITY AND FITNESS. IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR
-# BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-# DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-# ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-# OF THIS SOFTWARE.
-# --------------------------------------------------------------------
-
-"""
-Usage::
-
- >>> from lxml.htmlbuilder import *
- >>> html = HTML(
- ... HEAD( TITLE("Hello World") ),
- ... BODY( CLASS("main"),
- ... H1("Hello World !")
- ... )
- ... )
-
- >>> import lxml.etree
- >>> print lxml.etree.tostring(html, pretty_print=True)
- <html>
- <head>
- <title>Hello World</title>
- </head>
- <body class="main">
- <h1>Hello World !</h1>
- </body>
- </html>
-
-"""
-
-from builder import E
-
-# elements
-A = E.a # anchor
-ABBR = E.abbr # abbreviated form (e.g., WWW, HTTP, etc.)
-ACRONYM = E.acronym #
-ADDRESS = E.address # information on author
-APPLET = E.applet # Java applet (DEPRECATED)
-AREA = E.area # client-side image map area
-B = E.b # bold text style
-BASE = E.base # document base URI
-BASEFONT = E.basefont # base font size (DEPRECATED)
-BDO = E.bdo # I18N BiDi over-ride
-BIG = E.big # large text style
-BLOCKQUOTE = E.blockquote # long quotation
-BODY = E.body # document body
-BR = E.br # forced line break
-BUTTON = E.button # push button
-CAPTION = E.caption # table caption
-CENTER = E.center # shorthand for DIV align=center (DEPRECATED)
-CITE = E.cite # citation
-CODE = E.code # computer code fragment
-COL = E.col # table column
-COLGROUP = E.colgroup # table column group
-DD = E.dd # definition description
-DEL = getattr(E, 'del') # deleted text
-DFN = E.dfn # instance definition
-DIR = E.dir # directory list (DEPRECATED)
-DIV = E.div # generic language/style container
-DL = E.dl # definition list
-DT = E.dt # definition term
-EM = E.em # emphasis
-FIELDSET = E.fieldset # form control group
-FONT = E.font # local change to font (DEPRECATED)
-FORM = E.form # interactive form
-FRAME = E.frame # subwindow
-FRAMESET = E.frameset # window subdivision
-H1 = E.h1 # heading
-H2 = E.h2 # heading
-H3 = E.h3 # heading
-H4 = E.h4 # heading
-H5 = E.h5 # heading
-H6 = E.h6 # heading
-HEAD = E.head # document head
-HR = E.hr # horizontal rule
-HTML = E.html # document root element
-I = E.i # italic text style
-IFRAME = E.iframe # inline subwindow
-IMG = E.img # Embedded image
-INPUT = E.input # form control
-INS = E.ins # inserted text
-ISINDEX = E.isindex # single line prompt (DEPRECATED)
-KBD = E.kbd # text to be entered by the user
-LABEL = E.label # form field label text
-LEGEND = E.legend # fieldset legend
-LI = E.li # list item
-LINK = E.link # a media-independent link
-MAP = E.map # client-side image map
-MENU = E.menu # menu list (DEPRECATED)
-META = E.meta # generic metainformation
-NOFRAMES = E.noframes # alternate content container for non frame-based rendering
-NOSCRIPT = E.noscript # alternate content container for non script-based rendering
-OBJECT = E.object # generic embedded object
-OL = E.ol # ordered list
-OPTGROUP = E.optgroup # option group
-OPTION = E.option # selectable choice
-P = E.p # paragraph
-PARAM = E.param # named property value
-PRE = E.pre # preformatted text
-Q = E.q # short inline quotation
-S = E.s # strike-through text style (DEPRECATED)
-SAMP = E.samp # sample program output, scripts, etc.
-SCRIPT = E.script # script statements
-SELECT = E.select # option selector
-SMALL = E.small # small text style
-SPAN = E.span # generic language/style container
-STRIKE = E.strike # strike-through text (DEPRECATED)
-STRONG = E.strong # strong emphasis
-STYLE = E.style # style info
-SUB = E.sub # subscript
-SUP = E.sup # superscript
-TABLE = E.table #
-TBODY = E.tbody # table body
-TD = E.td # table data cell
-TEXTAREA = E.textarea # multi-line text field
-TFOOT = E.tfoot # table footer
-TH = E.th # table header cell
-THEAD = E.thead # table header
-TITLE = E.title # document title
-TR = E.tr # table row
-TT = E.tt # teletype or monospaced text style
-U = E.u # underlined text style (DEPRECATED)
-UL = E.ul # unordered list
-VAR = E.var # instance of a variable or program argument
-
-# attributes (only reserved words are included here)
-ATTR = dict
-def CLASS(v): return {'class': v}
-def FOR(v): return {'for': v}
More information about the lxml-checkins
mailing list