[Python-modules-commits] r13376 - in packages/nltk/trunk/debian (4 files)
jwilk at users.alioth.debian.org
jwilk at users.alioth.debian.org
Fri Jun 11 11:05:26 UTC 2010
Date: Friday, June 11, 2010 @ 11:05:12
Author: jwilk
Revision: 13376
Get rid of embedded copy of ElementTree.
Added:
packages/nltk/trunk/debian/patches/etree.diff
Modified:
packages/nltk/trunk/debian/changelog
packages/nltk/trunk/debian/patches/series
packages/nltk/trunk/debian/rules
Modified: packages/nltk/trunk/debian/changelog
===================================================================
--- packages/nltk/trunk/debian/changelog 2010-06-11 10:20:47 UTC (rev 13375)
+++ packages/nltk/trunk/debian/changelog 2010-06-11 11:05:12 UTC (rev 13376)
@@ -1,5 +1,6 @@
nltk (2.0~b8-1) UNRELEASED; urgency=low
* Initial release (Closes: #279422)
+ * Get rid of embedded copy of ElementTree. [etree.diff]
- -- Jakub Wilk <jwilk at debian.org> Fri, 11 Jun 2010 12:09:21 +0200
+ -- Jakub Wilk <jwilk at debian.org> Fri, 11 Jun 2010 12:55:09 +0200
Added: packages/nltk/trunk/debian/patches/etree.diff
===================================================================
--- packages/nltk/trunk/debian/patches/etree.diff (rev 0)
+++ packages/nltk/trunk/debian/patches/etree.diff 2010-06-11 11:05:12 UTC (rev 13376)
@@ -0,0 +1,236 @@
+Description: Get rid of embedded copy of ElementTree.
+Author: Jakub Wilk <jwilk at debian.org>
+Forwarded: no
+
+--- a/nltk/downloader.py
++++ b/nltk/downloader.py
+@@ -176,7 +176,7 @@
+ TKINTER = False
+ TclError = ValueError
+
+-from nltk.etree import ElementTree
++from xml.etree import ElementTree
+ import nltk
+ urllib2 = nltk.internals.import_from_stdlib('urllib2')
+
+--- a/nltk/compat.py
++++ b/nltk/compat.py
+@@ -24,10 +24,7 @@
+
+ # ElementTree
+
+-try:
+- from xml.etree import ElementTree
+-except ImportError:
+- from nltk.etree import ElementTree
++from xml.etree import ElementTree
+
+ # collections.defaultdict
+ # originally contributed by Yoav Goldberg <yoav.goldberg at gmail.com>
+--- a/nltk/internals.py
++++ b/nltk/internals.py
+@@ -20,7 +20,7 @@
+
+ # Use the c version of ElementTree, which is faster, if possible:
+ try: from xml.etree import cElementTree as ElementTree
+-except ImportError: from nltk.etree import ElementTree
++except ImportError: from xml.etree import ElementTree
+
+ ######################################################################
+ # Regular Expression Processing
+--- a/nltk/olac.py
++++ b/nltk/olac.py
+@@ -16,7 +16,7 @@
+ @type xml: C{string}
+ @rtype: C{list} of C{tuple}
+ """
+- from lxml import etree
++ from xml import etree
+
+ root = etree.parse(StringIO(xml)).getroot()
+ return [(element.tag, element.attrib, element.text) for element in root.getchildren()]
+@@ -31,7 +31,7 @@
+ print
+
+ def demo():
+- from lxml import etree
++ from xml import etree
+ import nltk.data
+
+ file = nltk.data.find('corpora/treebank/olac.xml')
+--- a/nltk/chunk/named_entity.py
++++ b/nltk/chunk/named_entity.py
+@@ -10,7 +10,7 @@
+ """
+
+ import os, re, pickle
+-from nltk.etree import ElementTree as ET
++from xml.etree import ElementTree as ET
+ from nltk.chunk.api import *
+ from nltk.chunk.util import *
+ import nltk
+--- a/nltk/corpus/reader/util.py
++++ b/nltk/corpus/reader/util.py
+@@ -17,7 +17,7 @@
+
+ # Use the c version of ElementTree, which is faster, if possible:
+ try: from xml.etree import cElementTree as ElementTree
+-except ImportError: from nltk.etree import ElementTree
++except ImportError: from xml.etree import ElementTree
+
+ from nltk.tokenize import wordpunct_tokenize
+ from nltk.internals import deprecated, slice_bounds
+--- a/nltk/corpus/reader/nombank.py
++++ b/nltk/corpus/reader/nombank.py
+@@ -10,7 +10,7 @@
+ import codecs
+
+ from nltk.tree import Tree
+-from nltk.etree import ElementTree
++from xml.etree import ElementTree
+
+ from nltk.corpus.reader.util import *
+ from nltk.corpus.reader.api import *
+--- a/nltk/corpus/reader/xmldocs.py
++++ b/nltk/corpus/reader/xmldocs.py
+@@ -15,7 +15,7 @@
+
+ # Use the c version of ElementTree, which is faster, if possible:
+ try: from xml.etree import cElementTree as ElementTree
+-except ImportError: from nltk.etree import ElementTree
++except ImportError: from xml.etree import ElementTree
+
+ from nltk.data import SeekableUnicodeStreamReader
+ from nltk.tokenize import WordPunctTokenizer
+--- a/nltk/corpus/reader/propbank.py
++++ b/nltk/corpus/reader/propbank.py
+@@ -9,7 +9,7 @@
+ import codecs
+
+ from nltk.tree import Tree
+-from nltk.etree import ElementTree
++from xml.etree import ElementTree
+
+ from util import *
+ from api import *
+--- a/nltk/corpus/reader/senseval.py
++++ b/nltk/corpus/reader/senseval.py
+@@ -28,7 +28,7 @@
+ from xmldocs import XMLCorpusReader
+
+ from nltk.tokenize import *
+-from nltk.etree import ElementTree
++from xml.etree import ElementTree
+ from nltk.internals import deprecated
+
+ from util import *
+--- a/nltk/corpus/reader/bnc.py
++++ b/nltk/corpus/reader/bnc.py
+@@ -12,7 +12,7 @@
+
+ import re
+
+-import nltk.etree.ElementTree as ET
++import xml.etree.ElementTree as ET
+
+ from api import *
+ from util import *
+--- a/nltk/toolbox/toolbox.py
++++ b/nltk/toolbox/toolbox.py
+@@ -12,7 +12,7 @@
+
+ import os, re, codecs
+ from StringIO import StringIO
+-from nltk.etree.ElementTree import TreeBuilder, Element, SubElement
++from xml.etree.ElementTree import TreeBuilder, Element, SubElement
+ from nltk.data import PathPointer, ZipFilePathPointer
+ import nltk
+
+@@ -480,7 +480,7 @@
+ for field in islice(lexicon.findall('record/lx'), 10):
+ print field.text
+
+- from nltk.etree.ElementTree import ElementTree
++ from xml.etree.ElementTree import ElementTree
+
+ settings = ToolboxSettings()
+ file_path = nltk.data.find('corpora/toolbox/MDF/MDF_AltH.typ')
+--- a/nltk/tag/crf.py
++++ b/nltk/tag/crf.py
+@@ -28,7 +28,7 @@
+
+ from nltk.classify.maxent import *
+ from nltk.classify.mallet import call_mallet
+-from nltk.etree import ElementTree
++from xml.etree import ElementTree
+
+ from api import *
+
+--- a/nltk/test/corpus.doctest
++++ b/nltk/test/corpus.doctest
+@@ -592,7 +592,7 @@
+ 1 thing turning
+ m direction, location
+
+- >>> from nltk.etree import ElementTree
++ >>> from xml.etree import ElementTree
+ >>> print ElementTree.tostring(turn_01.find('example')).strip()
+ <example name="transitive agentive">
+ <text>
+@@ -708,7 +708,7 @@
+ as XML files. These corpora are returned as ElementTree objects:
+
+ >>> from nltk.corpus import shakespeare
+- >>> from nltk.etree import ElementTree
++ >>> from xml.etree import ElementTree
+ >>> shakespeare.fileids() # doctest: +ELLIPSIS
+ ['a_and_c.xml', 'dream.xml', 'hamlet.xml', 'j_caesar.xml', ...]
+ >>> play = shakespeare.xml('dream.xml')
+@@ -738,7 +738,7 @@
+ distribution of part-of-speech tags for reduplicated words.
+
+ >>> from nltk.corpus import toolbox
+- >>> from nltk.etree import ElementTree
++ >>> from xml.etree import ElementTree
+ >>> from nltk.probability import FreqDist
+ >>> import re
+ >>> rotokas = toolbox.xml('rotokas.dic')
+@@ -1282,7 +1282,7 @@
+ method, which expects a roleset identifier, not a file identifier:
+
+ >>> roleset = nltk.corpus.propbank.roleset('eat.01')
+- >>> from nltk.etree import ElementTree as ET
++ >>> from xml.etree import ElementTree as ET
+ >>> print ET.tostring(roleset) # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
+ <roleset id="eat.01" name="consume" vncls="39.1">
+ <roles>
+--- a/nltk/test/toolbox.doctest
++++ b/nltk/test/toolbox.doctest
+@@ -246,7 +246,7 @@
+ -------------------------------
+ check that normal parsing works:
+
+- >>> from nltk.etree import ElementTree
++ >>> from xml.etree import ElementTree
+ >>> td = toolbox.ToolboxData()
+ >>> s = """\\_sh v3.0 400 Rotokas Dictionary
+ ... \\_DateStampHasFourDigitYear
+@@ -274,7 +274,7 @@
+
+ check that guessing the key marker works:
+
+- >>> from nltk.etree import ElementTree
++ >>> from xml.etree import ElementTree
+ >>> td = toolbox.ToolboxData()
+ >>> s = """\\_sh v3.0 400 Rotokas Dictionary
+ ... \\_DateStampHasFourDigitYear
+--- a/setup.py
++++ b/setup.py
+@@ -57,7 +57,6 @@
+ 'nltk.tag',
+ 'nltk.tokenize',
+ 'nltk.toolbox',
+- 'nltk.etree',
+ ],
+ )
+
Modified: packages/nltk/trunk/debian/patches/series
===================================================================
--- packages/nltk/trunk/debian/patches/series 2010-06-11 10:20:47 UTC (rev 13375)
+++ packages/nltk/trunk/debian/patches/series 2010-06-11 11:05:12 UTC (rev 13376)
@@ -1 +1,2 @@
10-remove-mallet-interface.patch
+etree.diff
Modified: packages/nltk/trunk/debian/rules
===================================================================
--- packages/nltk/trunk/debian/rules 2010-06-11 10:20:47 UTC (rev 13375)
+++ packages/nltk/trunk/debian/rules 2010-06-11 11:05:12 UTC (rev 13376)
@@ -1,5 +1,10 @@
#!/usr/bin/make -f
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+ rm -Rf nltk/etree/
+ dh_auto_build
+
.PHONY: build build-arch build-indep binary binary-arch binary-indep clean
build build-arch build-indep binary binary-indep clean:
dh $(@)
More information about the Python-modules-commits
mailing list