Fixing other_packages and sys.path

tests/test-broken-html.py

@@ -3,7 +3,7 @@
 parser) can parse.
 """
 
-from _mechanize_dist import ClientForm
+from twill.other_packages._mechanize_dist import ClientForm
 
 import twilltestlib
 from twill import commands

tests/test-checkbox.py

@@ -2,7 +2,7 @@
 import twill
 from twill import namespaces, commands
 from twill.errors import TwillAssertionError
-from _mechanize_dist import BrowserStateError, ClientForm
+from twill.other_packages._mechanize_dist import BrowserStateError, ClientForm
 
 def setup_module():
     global url

tests/test-encoding.py

@@ -1,5 +1,5 @@
 import twilltestlib
-from _mechanize_dist import ClientForm
+from twill.other_packages._mechanize_dist import ClientForm
 from cStringIO import StringIO
 
 def test_form_parse():

tests/test-form.py

@@ -2,7 +2,7 @@
 import twill
 from twill import namespaces, commands
 from twill.errors import TwillAssertionError
-from _mechanize_dist import BrowserStateError, ClientForm
+from twill.other_packages._mechanize_dist import BrowserStateError, ClientForm
 
 def test():
     url = twilltestlib.get_url()

twill/__init__.py

@@ -31,7 +31,7 @@
             "set_errout"]
 
 #
-# add extensions (twill/extensions) and the the wwwsearch & pyparsing
+# add extensions (twill/extensions)
 # stuff from twill/included-packages/.  NOTE: this works with eggs! hooray!
 #
 
@@ -43,11 +43,6 @@
 extensions = os.path.join(thisdir, 'extensions')
 sys.path.append(extensions)
 
-# add other_packages in at the *beginning*, so that the correct
-# (patched) versions of pyparsing and mechanize get imported.
-wwwsearchlib = os.path.join(thisdir, 'other_packages')
-sys.path.insert(0, wwwsearchlib)
-
 # the two core components of twill:
 from shell import TwillCommandLoop
 from parse import execute_file, execute_string

twill/_browser.py

@@ -3,13 +3,13 @@
 """
 
 # wwwsearch imports
-from _mechanize_dist import Browser as MechanizeBrowser
+from other_packages._mechanize_dist import Browser as MechanizeBrowser
 
 import wsgi_intercept
 from utils import FixedHTTPBasicAuthHandler, FunctioningHTTPRefreshProcessor
 
 def build_http_handler():
-    from _mechanize_dist._urllib2 import HTTPHandler
+    from other_packages._mechanize_dist._urllib2 import HTTPHandler
 
     class MyHTTPHandler(HTTPHandler):
         def http_open(self, req):

twill/browser.py

@@ -10,8 +10,8 @@
 import re
 
 # wwwsearch imports
-import _mechanize_dist as mechanize
-from _mechanize_dist import BrowserStateError, LinkNotFoundError, ClientForm
+import other_packages._mechanize_dist as mechanize
+from other_packages._mechanize_dist import BrowserStateError, LinkNotFoundError, ClientForm
 
 # twill package imports
 from _browser import PatchedMechanizeBrowser

twill/commands.py

@@ -4,9 +4,9 @@
 """
 
 import sys
-import _mechanize_dist as mechanize
-from _mechanize_dist import ClientForm
-from _mechanize_dist._headersutil import is_html
+import other_packages._mechanize_dist as mechanize
+from other_packages._mechanize_dist import ClientForm
+from other_packages._mechanize_dist._headersutil import is_html
 
 OUT=None
 ERR=sys.stderr

twill/parse.py

@@ -6,7 +6,7 @@
 from cStringIO import StringIO
 
 from errors import TwillAssertionError, TwillNameError
-from pyparsing import OneOrMore, Word, printables, quotedString, Optional, \
+from other_packages.pyparsing import OneOrMore, Word, printables, quotedString, Optional, \
      alphas, alphanums, ParseException, ZeroOrMore, restOfLine, Combine, \
      Literal, Group, removeQuotes, CharsNotIn
 

twill/utils.py

@@ -8,12 +8,12 @@
 import os
 import base64
 
-import subprocess
+from other_packages import subprocess
 
-import _mechanize_dist as mechanize
-from _mechanize_dist import ClientForm
-from _mechanize_dist._util import time
-from _mechanize_dist._http import HTTPRefreshProcessor
+import other_packages._mechanize_dist as mechanize
+from other_packages._mechanize_dist import ClientForm
+from other_packages._mechanize_dist._util import time
+from other_packages._mechanize_dist._http import HTTPRefreshProcessor
 
 from errors import TwillException