zopefoundation / ZODB / 527

pending completion

Build # 527

Build Type

push

travis-ci

Committed by

jamadden

Commit Message

Remove utils.deprecated3[78]

They haven't been used in a long time.

Run Details

2 of 2 new or added lines in 1 file covered. (100.0%)

6314 of 8485 relevant lines covered (74.41%)

2.23 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/src/ZODB/transact.py

##############################################################################
#
# Copyright (c) 2003 Zope Foundation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
#
##############################################################################
"""Tools to simplify transactions within applications."""

from ZODB.POSException import ReadConflictError, ConflictError
import transaction

def _commit(note):
    t = transaction.get()
    if note:
        t.note(note)
    t.commit()

def transact(f, note=None, retries=5):
    """Returns transactional version of function argument f.

    Higher-order function that converts a regular function into
    a transactional function.  The transactional function will
    retry up to retries time before giving up.  If note, it will
    be added to the transaction metadata when it commits.

    The retries occur on ConflictErrors.  If some other
    TransactionError occurs, the transaction will not be retried.
    """

    # TODO:  deal with ZEO disconnected errors?

    def g(*args, **kwargs):
        n = retries
        while n:
            n -= 1
            try:
                r = f(*args, **kwargs)
            except ReadConflictError as msg:
                transaction.abort()
                if not n:
                    raise
                continue
            try:
                _commit(note)
            except ConflictError as msg:
                transaction.abort()
                if not n:
                    raise
                continue
            return r
        raise RuntimeError("couldn't commit transaction")
    return g

1	##############################################################################
2	#
3	# Copyright (c) 2003 Zope Foundation and Contributors.
4	# All Rights Reserved.
5	#
6	# This software is subject to the provisions of the Zope Public License,
7	# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
8	# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
9	# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
10	# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
11	# FOR A PARTICULAR PURPOSE
12	#
13	##############################################################################
14	"""Tools to simplify transactions within applications."""	×
15
16	from ZODB.POSException import ReadConflictError, ConflictError	×
17	import transaction	×
18
19	def _commit(note):	×
20	t = transaction.get()	×
21	if note:	×
22	t.note(note)	×
23	t.commit()	×
24
25	def transact(f, note=None, retries=5):	×
26	"""Returns transactional version of function argument f.
27
28	Higher-order function that converts a regular function into
29	a transactional function. The transactional function will
30	retry up to retries time before giving up. If note, it will
31	be added to the transaction metadata when it commits.
32
33	The retries occur on ConflictErrors. If some other
34	TransactionError occurs, the transaction will not be retried.
35	"""
36
37	# TODO: deal with ZEO disconnected errors?
38
39	def g(args, *kwargs):	×
40	n = retries	×
41	while n:	×
42	n -= 1	×
43	try:	×
44	r = f(args, *kwargs)	×
45	except ReadConflictError as msg:	×
46	transaction.abort()	×
47	if not n:	×
48	raise	×
49	continue	×
50	try:	×
51	_commit(note)	×
52	except ConflictError as msg:	×
53	transaction.abort()	×
54	if not n:	×
55	raise	×
56	continue	×
57	return r	×
58	raise RuntimeError("couldn't commit transaction")	×
59	return g	×

zopefoundation / ZODB / 527

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous