Skip to content

Threadsafety improvements using thread local storage #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Threadsafety improvements using thread local storage #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14c7141
Threadsafety improvements using thread local storage
dhionel Jun 10, 2011
031c6a7
Merge branch 'master' of git://github.com/jjlee/mechanize
dhionel May 15, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 15 additions & 22 deletions mechanize/_opener.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,31 +412,24 @@ def build_opener(self, *handlers):

build_opener = OpenerFactory().build_opener

_opener = None
urlopen_lock = _threading.Lock()
class _tls(_threading.local):
_opener = None

_tls00 = _tls()

def urlopen(url, data=None, timeout=_sockettimeout._GLOBAL_DEFAULT_TIMEOUT):
global _opener
if _opener is None:
urlopen_lock.acquire()
try:
if _opener is None:
_opener = build_opener()
finally:
urlopen_lock.release()
return _opener.open(url, data, timeout)
global _tls00
if _tls00._opener is None:
_tls00._opener = build_opener()
return _tls00._opener.open(url, data, timeout)

def urlretrieve(url, filename=None, reporthook=None, data=None,
timeout=_sockettimeout._GLOBAL_DEFAULT_TIMEOUT):
global _opener
if _opener is None:
urlopen_lock.acquire()
try:
if _opener is None:
_opener = build_opener()
finally:
urlopen_lock.release()
return _opener.retrieve(url, filename, reporthook, data, timeout)
global _tls00
if _tls00._opener is None:
_tls00._opener = build_opener()
return _tls00._opener.retrieve(url, filename, reporthook, data, timeout)

def install_opener(opener):
global _opener
_opener = opener
global _tls00
_tls00._opener = opener
20 changes: 13 additions & 7 deletions mechanize/_urllib2_fork.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,16 +110,22 @@ def splithost(url):
# used in User-Agent header sent
__version__ = sys.version[:3]

_opener = None
import threading

class _tls(threading.local):
_opener = None

_tls00 = _tls()

def urlopen(url, data=None, timeout=_sockettimeout._GLOBAL_DEFAULT_TIMEOUT):
global _opener
if _opener is None:
_opener = build_opener()
return _opener.open(url, data, timeout)
global _tls00
if _tls00._opener is None:
_tls00._opener = build_opener()
return _tls00._opener.open(url, data, timeout)

def install_opener(opener):
global _opener
_opener = opener
global _tls00
_tls00._opener = opener

# copied from cookielib.py
_cut_port_re = re.compile(r":\d+$")
Expand Down