[Python-modules-commits] r19504 - in packages/twill/tags (15 files)
arnau at users.alioth.debian.org
arnau at users.alioth.debian.org
Sun Dec 4 15:30:46 UTC 2011
Date: Sunday, December 4, 2011 @ 15:30:45
Author: arnau
Revision: 19504
[svn-buildpackage] Tagging twill 0.9-3
Added:
packages/twill/tags/0.9-3/
packages/twill/tags/0.9-3/debian/changelog
(from rev 19503, packages/twill/trunk/debian/changelog)
packages/twill/tags/0.9-3/debian/control
(from rev 19503, packages/twill/trunk/debian/control)
packages/twill/tags/0.9-3/debian/patches/02_remove_ext.patch
(from rev 19132, packages/twill/trunk/debian/patches/02_remove_ext.patch)
packages/twill/tags/0.9-3/debian/patches/04_fix_deprecated_ClientForm.patch
(from rev 19133, packages/twill/trunk/debian/patches/04_fix_deprecated_ClientForm.patch)
packages/twill/tags/0.9-3/debian/patches/05_fix_missing_imports.patch
(from rev 19175, packages/twill/trunk/debian/patches/05_fix_missing_imports.patch)
packages/twill/tags/0.9-3/debian/patches/series
(from rev 19175, packages/twill/trunk/debian/patches/series)
packages/twill/tags/0.9-3/debian/rules
(from rev 19176, packages/twill/trunk/debian/rules)
Deleted:
packages/twill/tags/0.9-3/debian/changelog
packages/twill/tags/0.9-3/debian/control
packages/twill/tags/0.9-3/debian/patches/02_remove_ext.patch
packages/twill/tags/0.9-3/debian/patches/series
packages/twill/tags/0.9-3/debian/pycompat
packages/twill/tags/0.9-3/debian/pyversions
packages/twill/tags/0.9-3/debian/rules
Deleted: packages/twill/tags/0.9-3/debian/changelog
===================================================================
--- packages/twill/trunk/debian/changelog 2011-11-01 04:22:42 UTC (rev 19131)
+++ packages/twill/tags/0.9-3/debian/changelog 2011-12-04 15:30:45 UTC (rev 19504)
@@ -1,63 +0,0 @@
-twill (0.9-2) unstable; urgency=low
-
- * debian/control:
- + Replace python-dev by python in Build-Depends.
- + Bump Standards-Version to 3.8.4. No changes needed.
- + Drop now useless debian/README.source.
- * debian/copyright:
- + Update copyright years.
- * Switch to dpkg-source 3.0 (quilt) format.
- + Remove Build-Depends on quilt in debian/control.
- + Remove include of patchsys-quilt.mk in debian/rules.
-
- -- Arnaud Fontaine <arnau at debian.org> Sun, 16 May 2010 13:52:13 +0100
-
-twill (0.9-1) unstable; urgency=low
-
- [ Arnaud Fontaine ]
- * New upstream bugfix release.
- * debian/control:
- + Add ${misc:Depends} to Depends in case the result of a call to
- debhelper tools adds extra dependencies.
- + Drop useless Build-Depends on patchutils.
- + Bump Standards-Version to 3.8.0.
- - Add debian/README.source.
- * debian/doc-base:
- + Change the section to Programming.
- * debian/copyright:
- + Update copyright years.
- + Reorganize to make copyright information clearer.
-
- [ Sandro Tosi ]
- * debian/control:
- - Uniforming Vcs-Browser field.
- - Switch Vcs-Browser field to viewsvn.
-
- -- Arnaud Fontaine <arnau at debian.org> Wed, 21 Jan 2009 23:54:29 +0000
-
-twill (0.9~b1-2) unstable; urgency=low
-
- [ Arnaud Fontaine ]
- * New email address.
- * Use quilt patch system instead of simple patchsys.
- * Remove useless debian/control.in.
- * Drop useless dependency on python-setuptools, use distutils instead.
- + Add debian/patches/03_no_setuptools.patch.
- * debian/patches/01_fix_history_path.patch:
- + Check whether HOME environment variable is set before using it.
- * debian/control:
- + Now depend on python-mechanize >= 0.1.7b-2 because it fixes
- #456944.
- + Update Standards-Version to 3.7.3. No changes needed.
-
- [ Piotr Ożarowski ]
- * Added debian/watch file.
- * Vcs-Svn, Vcs-Browser and Homepage fields added (dpkg support them now).
-
- -- Arnaud Fontaine <arnau at debian.org> Fri, 21 Dec 2007 03:04:41 +0000
-
-twill (0.9~b1-1) unstable; urgency=low
-
- * Initial release. Closes: #387152.
-
- -- Arnaud Fontaine <arnaud at andesi.org> Sun, 08 Apr 2007 10:37:43 +0200
Copied: packages/twill/tags/0.9-3/debian/changelog (from rev 19503, packages/twill/trunk/debian/changelog)
===================================================================
--- packages/twill/tags/0.9-3/debian/changelog (rev 0)
+++ packages/twill/tags/0.9-3/debian/changelog 2011-12-04 15:30:45 UTC (rev 19504)
@@ -0,0 +1,86 @@
+twill (0.9-3) unstable; urgency=low
+
+ * Add debian/patches/04_fix_deprecated_ClientForm.patch as ClientForm
+ is now shipped with mechanize.
+ + debian/rules:
+ - Drop Depends on python-clientform.
+ + debian/control:
+ - Bump python-mechanize Depends to >= 0.2.0~.
+ * debian/patches/02_remove_ext.patch:
+ + Fix tests as well.
+ * Add debian/patches/05_fix_missing_imports.patch.
+ * debian/control:
+ + Bump Standards-Version to 3.9.2. No changes needed.
+ * Switch from now deprecated pysupport to dh_python2.
+ + Drop debian/pyversions and debian/pycompat.
+ + debian/rules:
+ - Remove DEB_PYTHON_SYSTEM.
+ + debian/control:
+ - Add X-Python-Version field.
+ - Bump python and cdbs versions.
+
+ -- Arnaud Fontaine <arnau at debian.org> Sun, 04 Dec 2011 23:35:55 +0900
+
+twill (0.9-2) unstable; urgency=low
+
+ * debian/control:
+ + Replace python-dev by python in Build-Depends.
+ + Bump Standards-Version to 3.8.4. No changes needed.
+ + Drop now useless debian/README.source.
+ * debian/copyright:
+ + Update copyright years.
+ * Switch to dpkg-source 3.0 (quilt) format.
+ + Remove Build-Depends on quilt in debian/control.
+ + Remove include of patchsys-quilt.mk in debian/rules.
+
+ -- Arnaud Fontaine <arnau at debian.org> Sun, 16 May 2010 13:52:13 +0100
+
+twill (0.9-1) unstable; urgency=low
+
+ [ Arnaud Fontaine ]
+ * New upstream bugfix release.
+ * debian/control:
+ + Add ${misc:Depends} to Depends in case the result of a call to
+ debhelper tools adds extra dependencies.
+ + Drop useless Build-Depends on patchutils.
+ + Bump Standards-Version to 3.8.0.
+ - Add debian/README.source.
+ * debian/doc-base:
+ + Change the section to Programming.
+ * debian/copyright:
+ + Update copyright years.
+ + Reorganize to make copyright information clearer.
+
+ [ Sandro Tosi ]
+ * debian/control:
+ - Uniforming Vcs-Browser field.
+ - Switch Vcs-Browser field to viewsvn.
+
+ -- Arnaud Fontaine <arnau at debian.org> Wed, 21 Jan 2009 23:54:29 +0000
+
+twill (0.9~b1-2) unstable; urgency=low
+
+ [ Arnaud Fontaine ]
+ * New email address.
+ * Use quilt patch system instead of simple patchsys.
+ * Remove useless debian/control.in.
+ * Drop useless dependency on python-setuptools, use distutils instead.
+ + Add debian/patches/03_no_setuptools.patch.
+ * debian/patches/01_fix_history_path.patch:
+ + Check whether HOME environment variable is set before using it.
+ * debian/control:
+ + Now depend on python-mechanize >= 0.1.7b-2 because it fixes
+ #456944.
+ + Update Standards-Version to 3.7.3. No changes needed.
+
+ [ Piotr Ożarowski ]
+ * Added debian/watch file.
+ * Vcs-Svn, Vcs-Browser and Homepage fields added (dpkg support them now).
+
+ -- Arnaud Fontaine <arnau at debian.org> Fri, 21 Dec 2007 03:04:41 +0000
+
+twill (0.9~b1-1) unstable; urgency=low
+
+ * Initial release. Closes: #387152.
+
+ -- Arnaud Fontaine <arnaud at andesi.org> Sun, 08 Apr 2007 10:37:43 +0200
Deleted: packages/twill/tags/0.9-3/debian/control
===================================================================
--- packages/twill/trunk/debian/control 2011-11-01 04:22:42 UTC (rev 19131)
+++ packages/twill/tags/0.9-3/debian/control 2011-12-04 15:30:45 UTC (rev 19504)
@@ -1,30 +0,0 @@
-Source: twill
-Section: python
-Priority: optional
-Maintainer: Arnaud Fontaine <arnau at debian.org>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5.0.37.2),
- cdbs (>= 0.4.49),
- python (>= 2.3.5-11),
- python-support (>= 0.7.1),
-Build-Depends-Indep: xsltproc,
- docbook-xsl,
- docbook-xml,
-Standards-Version: 3.8.4
-Homepage: http://twill.idyll.org/
-Vcs-Svn: svn://svn.debian.org/python-modules/packages/twill/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/twill/trunk/
-
-Package: python-twill
-Architecture: all
-Depends: ${python:Depends},
- ${misc:Depends},
- python-mechanize (>= 0.1.7b-2),
- python-clientform (>= 0.2.6),
- python-pyparsing (>= 1.4.1)
-Recommends: doc-base
-Description: A simple scripting language for Web browsing
- Twill is a simple scripting language intended for programmatic or
- automated browsing of Web sites. It allows users to browse the Web
- from a command-line interface. So, you can navigate through Web sites
- that use forms, cookies, and most standard Web features.
Copied: packages/twill/tags/0.9-3/debian/control (from rev 19503, packages/twill/trunk/debian/control)
===================================================================
--- packages/twill/tags/0.9-3/debian/control (rev 0)
+++ packages/twill/tags/0.9-3/debian/control 2011-12-04 15:30:45 UTC (rev 19504)
@@ -0,0 +1,29 @@
+Source: twill
+Section: python
+Priority: optional
+Maintainer: Arnaud Fontaine <arnau at debian.org>
+Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Build-Depends: debhelper (>= 5.0.37.2),
+ cdbs (>= 0.4.90~),
+ python (>= 2.6.6-3~)
+Build-Depends-Indep: xsltproc,
+ docbook-xsl,
+ docbook-xml
+Standards-Version: 3.9.2
+X-Python-Version: >= 2.3
+Homepage: http://twill.idyll.org/
+Vcs-Svn: svn://svn.debian.org/python-modules/packages/twill/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/twill/trunk/
+
+Package: python-twill
+Architecture: all
+Depends: ${python:Depends},
+ ${misc:Depends},
+ python-mechanize (>= 0.2.0~),
+ python-pyparsing (>= 1.4.1)
+Recommends: doc-base
+Description: Simple scripting language for Web browsing
+ Twill is a simple scripting language intended for programmatic or
+ automated browsing of Web sites. It allows users to browse the Web
+ from a command-line interface. So, you can navigate through Web sites
+ that use forms, cookies, and most standard Web features.
Deleted: packages/twill/tags/0.9-3/debian/patches/02_remove_ext.patch
===================================================================
--- packages/twill/trunk/debian/patches/02_remove_ext.patch 2011-11-01 04:22:42 UTC (rev 19131)
+++ packages/twill/tags/0.9-3/debian/patches/02_remove_ext.patch 2011-12-04 15:30:45 UTC (rev 19504)
@@ -1,88 +0,0 @@
-Index: twill-0.9/setup.py
-===================================================================
---- twill-0.9.orig/setup.py 2007-12-28 06:45:16.000000000 +0000
-+++ twill-0.9/setup.py 2009-01-19 01:00:23.000000000 +0000
-@@ -18,8 +18,7 @@
- author_email = 'titus at idyll.org',
- license='MIT',
-
-- packages = ['twill', 'twill.other_packages',
-- 'twill.other_packages._mechanize_dist',
-+ packages = ['twill',
- 'twill.extensions',
- 'twill.extensions.match_parse'],
-
-Index: twill-0.9/twill/_browser.py
-===================================================================
---- twill-0.9.orig/twill/_browser.py 2007-12-28 06:45:16.000000000 +0000
-+++ twill-0.9/twill/_browser.py 2009-01-19 01:01:30.000000000 +0000
-@@ -3,13 +3,13 @@
- """
-
- # wwwsearch imports
--from _mechanize_dist import Browser as MechanizeBrowser
-+from mechanize import Browser as MechanizeBrowser
-
- import wsgi_intercept
- from utils import FixedHTTPBasicAuthHandler, FunctioningHTTPRefreshProcessor
-
- def build_http_handler():
-- from _mechanize_dist._urllib2 import HTTPHandler
-+ from mechanize._urllib2 import HTTPHandler
-
- class MyHTTPHandler(HTTPHandler):
- def http_open(self, req):
-Index: twill-0.9/twill/browser.py
-===================================================================
---- twill-0.9.orig/twill/browser.py 2007-12-28 06:45:16.000000000 +0000
-+++ twill-0.9/twill/browser.py 2009-01-19 01:00:23.000000000 +0000
-@@ -10,8 +10,9 @@
- import re
-
- # wwwsearch imports
--import _mechanize_dist as mechanize
--from _mechanize_dist import BrowserStateError, LinkNotFoundError, ClientForm
-+import mechanize
-+import ClientForm
-+from mechanize import BrowserStateError, LinkNotFoundError
-
- # twill package imports
- from _browser import PatchedMechanizeBrowser
-Index: twill-0.9/twill/commands.py
-===================================================================
---- twill-0.9.orig/twill/commands.py 2007-12-28 06:45:16.000000000 +0000
-+++ twill-0.9/twill/commands.py 2009-01-19 01:00:23.000000000 +0000
-@@ -4,9 +4,9 @@
- """
-
- import sys
--import _mechanize_dist as mechanize
--from _mechanize_dist import ClientForm
--from _mechanize_dist._headersutil import is_html
-+import mechanize
-+import ClientForm
-+from mechanize._headersutil import is_html
-
- OUT=None
- ERR=sys.stderr
-Index: twill-0.9/twill/utils.py
-===================================================================
---- twill-0.9.orig/twill/utils.py 2007-12-28 06:45:16.000000000 +0000
-+++ twill-0.9/twill/utils.py 2009-01-19 01:00:23.000000000 +0000
-@@ -11,11 +11,11 @@
-
- import subprocess
-
--import _mechanize_dist as mechanize
--from _mechanize_dist import ClientForm
--from _mechanize_dist._util import time
--from _mechanize_dist._http import HTTPRefreshProcessor
--from _mechanize_dist import BrowserStateError
-+import mechanize
-+import ClientForm
-+from mechanize._util import time
-+from mechanize._http import HTTPRefreshProcessor
-+from mechanize import BrowserStateError
-
- class ResultWrapper:
- """
Copied: packages/twill/tags/0.9-3/debian/patches/02_remove_ext.patch (from rev 19132, packages/twill/trunk/debian/patches/02_remove_ext.patch)
===================================================================
--- packages/twill/tags/0.9-3/debian/patches/02_remove_ext.patch (rev 0)
+++ packages/twill/tags/0.9-3/debian/patches/02_remove_ext.patch 2011-12-04 15:30:45 UTC (rev 19504)
@@ -0,0 +1,167 @@
+Index: twill-0.9/setup.py
+===================================================================
+--- twill-0.9.orig/setup.py 2007-12-28 15:45:16.000000000 +0900
++++ twill-0.9/setup.py 2011-11-01 16:07:25.679717491 +0900
+@@ -18,8 +18,7 @@
+ author_email = 'titus at idyll.org',
+ license='MIT',
+
+- packages = ['twill', 'twill.other_packages',
+- 'twill.other_packages._mechanize_dist',
++ packages = ['twill',
+ 'twill.extensions',
+ 'twill.extensions.match_parse'],
+
+Index: twill-0.9/twill/_browser.py
+===================================================================
+--- twill-0.9.orig/twill/_browser.py 2007-12-28 15:45:16.000000000 +0900
++++ twill-0.9/twill/_browser.py 2011-11-01 15:50:22.000000000 +0900
+@@ -3,13 +3,13 @@
+ """
+
+ # wwwsearch imports
+-from _mechanize_dist import Browser as MechanizeBrowser
++from mechanize import Browser as MechanizeBrowser
+
+ import wsgi_intercept
+ from utils import FixedHTTPBasicAuthHandler, FunctioningHTTPRefreshProcessor
+
+ def build_http_handler():
+- from _mechanize_dist._urllib2 import HTTPHandler
++ from mechanize._urllib2 import HTTPHandler
+
+ class MyHTTPHandler(HTTPHandler):
+ def http_open(self, req):
+Index: twill-0.9/twill/browser.py
+===================================================================
+--- twill-0.9.orig/twill/browser.py 2007-12-28 15:45:16.000000000 +0900
++++ twill-0.9/twill/browser.py 2011-11-01 16:07:24.295717438 +0900
+@@ -10,8 +10,9 @@
+ import re
+
+ # wwwsearch imports
+-import _mechanize_dist as mechanize
+-from _mechanize_dist import BrowserStateError, LinkNotFoundError, ClientForm
++import mechanize
++import ClientForm
++from mechanize import BrowserStateError, LinkNotFoundError
+
+ # twill package imports
+ from _browser import PatchedMechanizeBrowser
+Index: twill-0.9/twill/commands.py
+===================================================================
+--- twill-0.9.orig/twill/commands.py 2007-12-28 15:45:16.000000000 +0900
++++ twill-0.9/twill/commands.py 2011-11-01 16:07:24.287717438 +0900
+@@ -4,9 +4,9 @@
+ """
+
+ import sys
+-import _mechanize_dist as mechanize
+-from _mechanize_dist import ClientForm
+-from _mechanize_dist._headersutil import is_html
++import mechanize
++import ClientForm
++from mechanize._headersutil import is_html
+
+ OUT=None
+ ERR=sys.stderr
+Index: twill-0.9/twill/utils.py
+===================================================================
+--- twill-0.9.orig/twill/utils.py 2007-12-28 15:45:16.000000000 +0900
++++ twill-0.9/twill/utils.py 2011-11-01 16:07:24.303717438 +0900
+@@ -11,11 +11,11 @@
+
+ import subprocess
+
+-import _mechanize_dist as mechanize
+-from _mechanize_dist import ClientForm
+-from _mechanize_dist._util import time
+-from _mechanize_dist._http import HTTPRefreshProcessor
+-from _mechanize_dist import BrowserStateError
++import mechanize
++import ClientForm
++from mechanize._util import time
++from mechanize._http import HTTPRefreshProcessor
++from mechanize import BrowserStateError
+
+ class ResultWrapper:
+ """
+Index: twill-0.9/tests/test-broken-html.py
+===================================================================
+--- twill-0.9.orig/tests/test-broken-html.py 2007-12-28 15:45:16.000000000 +0900
++++ twill-0.9/tests/test-broken-html.py 2011-11-01 16:12:57.815730121 +0900
+@@ -3,8 +3,6 @@
+ parser) can parse.
+ """
+
+-from _mechanize_dist import ClientForm
+-
+ import twilltestlib
+ from twill import commands
+
+Index: twill-0.9/tests/test-checkbox.py
+===================================================================
+--- twill-0.9.orig/tests/test-checkbox.py 2007-12-28 15:45:16.000000000 +0900
++++ twill-0.9/tests/test-checkbox.py 2011-11-01 16:12:48.751729776 +0900
+@@ -2,7 +2,8 @@
+ import twill
+ from twill import namespaces, commands
+ from twill.errors import TwillAssertionError
+-from _mechanize_dist import BrowserStateError, ClientForm
++import mechanize
++import ClientForm
+
+ def setup_module():
+ global url
+@@ -15,7 +16,7 @@
+ try:
+ browser.get_title()
+ assert 0, "should never get here"
+- except BrowserStateError:
++ except mechanize.BrowserStateError:
+ pass
+
+ commands.go(url)
+@@ -53,7 +54,7 @@
+ try:
+ browser.get_title()
+ assert 0, "should never get here"
+- except BrowserStateError:
++ except mechanize.BrowserStateError:
+ pass
+
+ commands.go(url)
+Index: twill-0.9/tests/test-encoding.py
+===================================================================
+--- twill-0.9.orig/tests/test-encoding.py 2007-12-28 15:45:16.000000000 +0900
++++ twill-0.9/tests/test-encoding.py 2011-11-01 16:11:54.079727697 +0900
+@@ -1,5 +1,5 @@
+ import twilltestlib
+-from _mechanize_dist import ClientForm
++import ClientForm
+ from cStringIO import StringIO
+
+ def test_form_parse():
+Index: twill-0.9/tests/test-form.py
+===================================================================
+--- twill-0.9.orig/tests/test-form.py 2007-12-28 15:45:16.000000000 +0900
++++ twill-0.9/tests/test-form.py 2011-11-01 16:13:20.135730970 +0900
+@@ -2,7 +2,8 @@
+ import twill
+ from twill import namespaces, commands
+ from twill.errors import TwillAssertionError
+-from _mechanize_dist import BrowserStateError, ClientForm
++import ClientForm
++import mechanize
+
+ def test():
+ url = twilltestlib.get_url()
+@@ -14,7 +15,7 @@
+ try:
+ browser.get_title()
+ assert 0, "should never get here"
+- except BrowserStateError:
++ except mechanize.BrowserStateError:
+ pass
+
+ ### now test a few special cases
Copied: packages/twill/tags/0.9-3/debian/patches/04_fix_deprecated_ClientForm.patch (from rev 19133, packages/twill/trunk/debian/patches/04_fix_deprecated_ClientForm.patch)
===================================================================
--- packages/twill/tags/0.9-3/debian/patches/04_fix_deprecated_ClientForm.patch (rev 0)
+++ packages/twill/tags/0.9-3/debian/patches/04_fix_deprecated_ClientForm.patch 2011-12-04 15:30:45 UTC (rev 19504)
@@ -0,0 +1,173 @@
+Index: twill-0.9/twill/browser.py
+===================================================================
+--- twill-0.9.orig/twill/browser.py 2011-11-01 16:07:24.295717438 +0900
++++ twill-0.9/twill/browser.py 2011-11-01 16:14:07.983732789 +0900
+@@ -11,7 +11,7 @@
+
+ # wwwsearch imports
+ import mechanize
+-import ClientForm
++import mechanize
+ from mechanize import BrowserStateError, LinkNotFoundError
+
+ # twill package imports
+@@ -389,7 +389,7 @@
+ self.last_submit_button = None
+
+ # record the last submit button clicked.
+- if isinstance(control, ClientForm.SubmitControl):
++ if isinstance(control, mechanize.SubmitControl):
+ self.last_submit_button = control
+
+ def submit(self, fieldname=None):
+@@ -421,7 +421,7 @@
+ else:
+ # get first submit button in form.
+ submits = [ c for c in form.controls \
+- if isinstance(c, ClientForm.SubmitControl) ]
++ if isinstance(c, mechanize.SubmitControl) ]
+
+ if len(submits):
+ ctl = submits[0]
+@@ -441,7 +441,7 @@
+ Note: submit is using submit button: name="%s", value="%s"
+ """ % (ctl.name, ctl.value)
+
+- if isinstance(ctl, ClientForm.ImageControl):
++ if isinstance(ctl, mechanize.ImageControl):
+ request = ctl._click(form, (1,1), "", mechanize.Request)
+ else:
+ request = ctl._click(form, True, "", mechanize.Request)
+Index: twill-0.9/twill/commands.py
+===================================================================
+--- twill-0.9.orig/twill/commands.py 2011-11-01 16:07:24.287717438 +0900
++++ twill-0.9/twill/commands.py 2011-11-01 16:14:07.983732789 +0900
+@@ -5,7 +5,7 @@
+
+ import sys
+ import mechanize
+-import ClientForm
++import mechanize
+ from mechanize._headersutil import is_html
+
+ OUT=None
+@@ -440,11 +440,11 @@
+ print>>OUT, 'forcing read-only form field to writeable'
+ control.readonly = False
+
+- if control.readonly or isinstance(control, ClientForm.IgnoreControl):
++ if control.readonly or isinstance(control, mechanize.IgnoreControl):
+ print>>OUT, 'form field is read-only or ignorable; nothing done.'
+ return
+
+- if isinstance(control, ClientForm.FileControl):
++ if isinstance(control, mechanize.FileControl):
+ raise TwillException('form field is for file upload; use "formfile" instead')
+
+ set_form_control_value(control, value)
+Index: twill-0.9/twill/utils.py
+===================================================================
+--- twill-0.9.orig/twill/utils.py 2011-11-01 16:07:24.303717438 +0900
++++ twill-0.9/twill/utils.py 2011-11-01 16:14:07.983732789 +0900
+@@ -12,7 +12,7 @@
+ import subprocess
+
+ import mechanize
+-import ClientForm
++import mechanize
+ from mechanize._util import time
+ from mechanize._http import HTTPRefreshProcessor
+ from mechanize import BrowserStateError
+@@ -150,17 +150,17 @@
+ """
+ Helper function to deal with setting form values on checkboxes, lists etc.
+ """
+- if isinstance(control, ClientForm.CheckboxControl):
++ if isinstance(control, mechanize.CheckboxControl):
+ try:
+ checkbox = control.get()
+ checkbox.selected = make_boolean(val)
+ return
+- except ClientForm.AmbiguityError:
++ except mechanize.AmbiguityError:
+ # if there's more than one checkbox, use the behaviour for
+- # ClientForm.ListControl, below.
++ # mechanize.ListControl, below.
+ pass
+
+- if isinstance(control, ClientForm.ListControl):
++ if isinstance(control, mechanize.ListControl):
+ #
+ # for ListControls (checkboxes, multiselect, etc.) we first need
+ # to find the right *value*. Then we need to set it +/-.
+@@ -181,13 +181,13 @@
+
+ try:
+ item = control.get(name=val)
+- except ClientForm.ItemNotFoundError:
++ except mechanize.ItemNotFoundError:
+ try:
+ item = control.get(label=val)
+- except ClientForm.AmbiguityError:
+- raise ClientForm.ItemNotFoundError('multiple matches to value/label "%s" in list control' % (val,))
+- except ClientForm.ItemNotFoundError:
+- raise ClientForm.ItemNotFoundError('cannot find value/label "%s" in list control' % (val,))
++ except mechanize.AmbiguityError:
++ raise mechanize.ItemNotFoundError('multiple matches to value/label "%s" in list control' % (val,))
++ except mechanize.ItemNotFoundError:
++ raise mechanize.ItemNotFoundError('cannot find value/label "%s" in list control' % (val,))
+
+ if flag:
+ item.selected = 1
+Index: twill-0.9/tests/test-checkbox.py
+===================================================================
+--- twill-0.9.orig/tests/test-checkbox.py 2011-11-01 16:12:48.751729776 +0900
++++ twill-0.9/tests/test-checkbox.py 2011-11-01 16:14:59.267734741 +0900
+@@ -3,7 +3,6 @@
+ from twill import namespaces, commands
+ from twill.errors import TwillAssertionError
+ import mechanize
+-import ClientForm
+
+ def setup_module():
+ global url
+Index: twill-0.9/tests/test-encoding.py
+===================================================================
+--- twill-0.9.orig/tests/test-encoding.py 2011-11-01 16:11:54.079727697 +0900
++++ twill-0.9/tests/test-encoding.py 2011-11-01 16:14:45.851734229 +0900
+@@ -1,5 +1,5 @@
+ import twilltestlib
+-import ClientForm
++import mechanize
+ from cStringIO import StringIO
+
+ def test_form_parse():
+@@ -7,5 +7,5 @@
+ fp = StringIO(content)
+
+ # latin-1...
+- ClientForm.ParseFile(fp, "<test-encoding.py fp>", encoding='latin-1',
+- backwards_compat=False)
++ mechanize.ParseFile(fp, "<test-encoding.py fp>", encoding='latin-1',
++ backwards_compat=False)
+Index: twill-0.9/tests/test-form.py
+===================================================================
+--- twill-0.9.orig/tests/test-form.py 2011-11-01 16:13:20.135730970 +0900
++++ twill-0.9/tests/test-form.py 2011-11-01 16:14:29.291733600 +0900
+@@ -2,7 +2,6 @@
+ import twill
+ from twill import namespaces, commands
+ from twill.errors import TwillAssertionError
+-import ClientForm
+ import mechanize
+
+ def test():
+@@ -44,7 +43,7 @@
+ try:
+ commands.fv('1', 'selecttest', 'value')
+ assert 0
+- except ClientForm.ItemNotFoundError:
++ except mechanize.ItemNotFoundError:
+ pass
+
+ # test ambiguous match to name
Copied: packages/twill/tags/0.9-3/debian/patches/05_fix_missing_imports.patch (from rev 19175, packages/twill/trunk/debian/patches/05_fix_missing_imports.patch)
===================================================================
--- packages/twill/tags/0.9-3/debian/patches/05_fix_missing_imports.patch (rev 0)
+++ packages/twill/tags/0.9-3/debian/patches/05_fix_missing_imports.patch 2011-12-04 15:30:45 UTC (rev 19504)
@@ -0,0 +1,12 @@
+Index: twill-0.9/twill/utils.py
+===================================================================
+--- twill-0.9.orig/twill/utils.py 2011-11-07 16:44:06.000000000 +0900
++++ twill-0.9/twill/utils.py 2011-11-07 16:47:51.346998902 +0900
+@@ -16,6 +16,7 @@
+ from mechanize._util import time
+ from mechanize._http import HTTPRefreshProcessor
+ from mechanize import BrowserStateError
++from errors import TwillException
+
+ class ResultWrapper:
+ """
Deleted: packages/twill/tags/0.9-3/debian/patches/series
===================================================================
--- packages/twill/trunk/debian/patches/series 2011-11-01 04:22:42 UTC (rev 19131)
+++ packages/twill/tags/0.9-3/debian/patches/series 2011-12-04 15:30:45 UTC (rev 19504)
@@ -1,3 +0,0 @@
-01_fix_history_path.patch
-02_remove_ext.patch
-03_no_setuptools.patch
Copied: packages/twill/tags/0.9-3/debian/patches/series (from rev 19175, packages/twill/trunk/debian/patches/series)
===================================================================
--- packages/twill/tags/0.9-3/debian/patches/series (rev 0)
+++ packages/twill/tags/0.9-3/debian/patches/series 2011-12-04 15:30:45 UTC (rev 19504)
@@ -0,0 +1,5 @@
+01_fix_history_path.patch
+02_remove_ext.patch
+03_no_setuptools.patch
+04_fix_deprecated_ClientForm.patch
+05_fix_missing_imports.patch
Deleted: packages/twill/tags/0.9-3/debian/pycompat
===================================================================
--- packages/twill/trunk/debian/pycompat 2011-11-01 04:22:42 UTC (rev 19131)
+++ packages/twill/tags/0.9-3/debian/pycompat 2011-12-04 15:30:45 UTC (rev 19504)
@@ -1 +0,0 @@
-2
Deleted: packages/twill/tags/0.9-3/debian/pyversions
===================================================================
--- packages/twill/trunk/debian/pyversions 2011-11-01 04:22:42 UTC (rev 19131)
+++ packages/twill/tags/0.9-3/debian/pyversions 2011-12-04 15:30:45 UTC (rev 19504)
@@ -1 +0,0 @@
-2.3-
Deleted: packages/twill/tags/0.9-3/debian/rules
===================================================================
--- packages/twill/trunk/debian/rules 2011-11-01 04:22:42 UTC (rev 19131)
+++ packages/twill/tags/0.9-3/debian/rules 2011-12-04 15:30:45 UTC (rev 19504)
@@ -1,23 +0,0 @@
-#!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
-
-DEB_PYTHON_SYSTEM=pysupport
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-# Don't compress .py files
-DEB_COMPRESS_EXCLUDE := .py
-
-# Manpages stuff
-MANPAGES = debian/twill-sh.1 debian/twill-fork.1
-XSLT_CMD = xsltproc -nonet
-DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
-
-%.1: %.dbk
- cd $(<D) && $(XSLT_CMD) $(DB2MAN) $(<F)
-
-install/$(DEB_PYTHON_MODULE_PACKAGE):: $(MANPAGES)
-
-clean::
- -rm -f $(MANPAGES)
Copied: packages/twill/tags/0.9-3/debian/rules (from rev 19176, packages/twill/trunk/debian/rules)
===================================================================
--- packages/twill/tags/0.9-3/debian/rules (rev 0)
+++ packages/twill/tags/0.9-3/debian/rules 2011-12-04 15:30:45 UTC (rev 19504)
@@ -0,0 +1,21 @@
+#!/usr/bin/make -f
+# -*- mode: makefile; coding: utf-8 -*-
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+
+# Don't compress .py files
+DEB_COMPRESS_EXCLUDE := .py
+
+# Manpages stuff
+MANPAGES = debian/twill-sh.1 debian/twill-fork.1
+XSLT_CMD = xsltproc -nonet
+DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
+
+%.1: %.dbk
+ cd $(<D) && $(XSLT_CMD) $(DB2MAN) $(<F)
+
+install/$(DEB_PYTHON_MODULE_PACKAGE):: $(MANPAGES)
+
+clean::
+ -rm -f $(MANPAGES)
More information about the Python-modules-commits
mailing list