Attachment #258338 for bug #285169

View | Details | Raw Unified | Return to bug 285169
Collapse All | Expand All

Lines 18-24 setup(name = 'twill', Link Here

(-)a/setup.py (-1 / +1 lines)
18	author_email = 'titus@idyll.org',	18	author_email = 'titus@idyll.org',
19	license='MIT',	19	license='MIT',
20		20
21	packages = ['twill', 'twill.other_packages',	21	packages = ['twill',
22	'twill.other_packages._mechanize_dist',	22	'twill.other_packages._mechanize_dist',
23	'twill.extensions',	23	'twill.extensions',
24	'twill.extensions.match_parse'],	24	'twill.extensions.match_parse'],





"""

import re, base64, urlparse, posixpath, sys, copy

from urllib2 import BaseHandler
from urllib import getproxies, unquote, splittype, splituser, splitpasswd, \
     splitport

try:
    from hashlib import sha1 as sha, md5
except ImportError:
    import sha, md5


def _parse_proxy(proxy):
    """Return (scheme, user, password, host/port) given a URL or an authority.
- 

Return to bug 285169

Lines 11-22 included with the distribution). Link Here

(-)a/twill/other_packages/_mechanize_dist/_auth.py (-2 / +6 lines)
11		11
12	"""	12	"""
13		13
14	import re, base64, urlparse, posixpath, md5, sha, sys, copy	14	import re, base64, urlparse, posixpath, sys, copy
15		15
16	from urllib2 import BaseHandler	16	from urllib2 import BaseHandler
17	from urllib import getproxies, unquote, splittype, splituser, splitpasswd, \	17	from urllib import getproxies, unquote, splittype, splituser, splitpasswd, \
18	splitport	18	splitport
19		19
		20	try:
		21	from hashlib import sha1 as sha, md5
		22	except ImportError:
		23	import sha, md5
		24
20		25
21	def _parse_proxy(proxy):	26	def _parse_proxy(proxy):
22	"""Return (scheme, user, password, host/port) given a URL or an authority.	27	"""Return (scheme, user, password, host/port) given a URL or an authority.
23	-