← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_simple_set_pyx.pyx

Support no activity report on http sockets.

* bzrlib/tests/test_http.py:
(TestActivityMixin, TestNoReportActivity): Test that
_report_activity c an be None for reporting sockets.

* bzrlib/transport/http/_urllib2_wrappers.py:
(_ReportingFileSocket, ReportingSocket): _report_activity can be
None, handle that.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_simple_set_pyx.pyx
540
540
    return _check_self(self)._used
541
541
 
542
542
 
543
 
cdef api int SimpleSet_Next(object self, Py_ssize_t *pos,
544
 
                            PyObject **key) except -1:
 
543
cdef api int SimpleSet_Next(object self, Py_ssize_t *pos, PyObject **key):
545
544
    """Walk over items in a SimpleSet.
546
545
 
547
546
    :param pos: should be initialized to 0 by the caller, and will be updated
568
567
    return 1
569
568
 
570
569
 
571
 
cdef int SimpleSet_traverse(SimpleSet self, visitproc visit,
572
 
                            void *arg) except -1:
 
570
cdef int SimpleSet_traverse(SimpleSet self, visitproc visit, void *arg):
573
571
    """This is an implementation of 'tp_traverse' that hits the whole table.
574
572
 
575
573
    Cython/Pyrex don't seem to let you define a tp_traverse, and they only