[Python-modules-commits] r19132 - in packages/twill/trunk/debian (2 files)

[arnau at users.alioth.debian.org]

    Date: Tuesday, November 1, 2011 @ 07:19:06
  Author: arnau
Revision: 19132

Fix tests using embedded mechanize distribution.

Modified:
  packages/twill/trunk/debian/changelog
  packages/twill/trunk/debian/patches/02_remove_ext.patch

Modified: packages/twill/trunk/debian/changelog
===================================================================
--- packages/twill/trunk/debian/changelog	2011-11-01 04:22:42 UTC (rev 19131)
+++ packages/twill/trunk/debian/changelog	2011-11-01 07:19:06 UTC (rev 19132)
@@ -1,3 +1,10 @@
+twill (0.9-3) UNRELEASED; urgency=low
+
+  * debian/patches/02_remove_ext.patch:
+    + Fix tests as well.
+
+ -- Arnaud Fontaine <arnau at debian.org>  Tue, 01 Nov 2011 16:18:02 +0900
+
 twill (0.9-2) unstable; urgency=low
 
   * debian/control:

Modified: packages/twill/trunk/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/trunk/debian/patches/02_remove_ext.patch	2011-11-01 07:19:06 UTC (rev 19132)
@@ -1,7 +1,7 @@
 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
+--- 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',
@@ -14,8 +14,8 @@
  
 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
+--- 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 @@
  """
  
@@ -34,8 +34,8 @@
          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
+--- 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
  
@@ -50,8 +50,8 @@
  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
+--- 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 @@
  """
  
@@ -67,8 +67,8 @@
  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
+--- 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
@@ -86,3 +86,82 @@
  
  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