twill/remove_ext.patch

   1 Index: twill-0.9/setup.py
   2 ===================================================================
   3 --- twill-0.9.orig/setup.py     2007-12-28 06:45:16.000000000 +0000
   4 +++ twill-0.9/setup.py  2009-01-19 01:00:23.000000000 +0000
   5 @@ -18,8 +18,7 @@
   6        author_email = 'titus@idyll.org',
   7        license='MIT',
   8
   9 -      packages = ['twill', 'twill.other_packages',
  10 -                  'twill.other_packages._mechanize_dist',
  11 +      packages = ['twill',
  12                    'twill.extensions',
  13                    'twill.extensions.match_parse'],
  14
  15 Index: twill-0.9/twill/_browser.py
  16 ===================================================================
  17 --- twill-0.9.orig/twill/_browser.py    2007-12-28 06:45:16.000000000 +0000
  18 +++ twill-0.9/twill/_browser.py 2009-01-19 01:01:30.000000000 +0000
  19 @@ -3,13 +3,13 @@
  20  """
  21
  22  # wwwsearch imports
  23 -from _mechanize_dist import Browser as MechanizeBrowser
  24 +from mechanize import Browser as MechanizeBrowser
  25
  26  import wsgi_intercept
  27  from utils import FixedHTTPBasicAuthHandler, FunctioningHTTPRefreshProcessor
  28
  29  def build_http_handler():
  30 -    from _mechanize_dist._urllib2 import HTTPHandler
  31 +    from mechanize._urllib2 import HTTPHandler
  32
  33      class MyHTTPHandler(HTTPHandler):
  34          def http_open(self, req):
  35 Index: twill-0.9/twill/browser.py
  36 ===================================================================
  37 --- twill-0.9.orig/twill/browser.py     2007-12-28 06:45:16.000000000 +0000
  38 +++ twill-0.9/twill/browser.py  2009-01-19 01:00:23.000000000 +0000
  39 @@ -10,8 +10,9 @@
  40  import re
  41
  42  # wwwsearch imports
  43 -import _mechanize_dist as mechanize
  44 -from _mechanize_dist import BrowserStateError, LinkNotFoundError, ClientForm
  45 +import mechanize
  46 +import ClientForm
  47 +from mechanize import BrowserStateError, LinkNotFoundError
  48
  49  # twill package imports
  50  from _browser import PatchedMechanizeBrowser
  51 Index: twill-0.9/twill/commands.py
  52 ===================================================================
  53 --- twill-0.9.orig/twill/commands.py    2007-12-28 06:45:16.000000000 +0000
  54 +++ twill-0.9/twill/commands.py 2009-01-19 01:00:23.000000000 +0000
  55 @@ -4,9 +4,9 @@
  56  """
  57
  58  import sys
  59 -import _mechanize_dist as mechanize
  60 -from _mechanize_dist import ClientForm
  61 -from _mechanize_dist._headersutil import is_html
  62 +import mechanize
  63 +import ClientForm
  64 +from mechanize._headersutil import is_html
  65
  66  OUT=None
  67  ERR=sys.stderr
  68 Index: twill-0.9/twill/utils.py
  69 ===================================================================
  70 --- twill-0.9.orig/twill/utils.py       2007-12-28 06:45:16.000000000 +0000
  71 +++ twill-0.9/twill/utils.py    2009-01-19 01:00:23.000000000 +0000
  72 @@ -11,11 +11,11 @@
  73
  74  import subprocess
  75
  76 -import _mechanize_dist as mechanize
  77 -from _mechanize_dist import ClientForm
  78 -from _mechanize_dist._util import time
  79 -from _mechanize_dist._http import HTTPRefreshProcessor
  80 -from _mechanize_dist import BrowserStateError
  81 +import mechanize
  82 +import ClientForm
  83 +from mechanize._util import time
  84 +from mechanize._http import HTTPRefreshProcessor
  85 +from mechanize import BrowserStateError
  86
  87  class ResultWrapper:
  88      """