Skip to content

Commit 239a080

Browse files
authored
Merge pull request #117 from scrapinghub/use-correct-mro-for-mixins
Use correct MRO for mixins
2 parents 1522cd7 + 4482eb1 commit 239a080

18 files changed

+26
-20
lines changed

scrapinghub/client/collections.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
from ..hubstorage.collectionsrt import Collection as _Collection
77

8-
from .proxy import _Proxy, _DownloadableProxyMixin
8+
from .proxy import _Proxy
99
from .utils import update_kwargs
1010

1111

12-
class Collections(_Proxy, _DownloadableProxyMixin):
12+
class Collections(_Proxy):
1313
"""Access to project collections.
1414
1515
Not a public constructor: use :class:`~scrapinghub.client.projects.Project`

scrapinghub/client/items.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from .proxy import _ItemsResourceProxy, _DownloadableProxyMixin
44

55

6-
class Items(_ItemsResourceProxy, _DownloadableProxyMixin):
6+
class Items(_DownloadableProxyMixin, _ItemsResourceProxy):
77
"""Representation of collection of job items.
88
99
Not a public constructor: use :class:`~scrapinghub.client.jobs.Job`

scrapinghub/client/logs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from .utils import LogLevel
88

99

10-
class Logs(_ItemsResourceProxy, _DownloadableProxyMixin):
10+
class Logs(_DownloadableProxyMixin, _ItemsResourceProxy):
1111
"""Representation of collection of job logs.
1212
1313
Not a public constructor: use :class:`~scrapinghub.client.jobs.Job` instance

scrapinghub/client/proxy.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,13 @@ def iter(self, _path=None, count=None, requests_params=None, **apiparams):
110110
"""
111111
update_kwargs(apiparams, count=count)
112112
apiparams = self._modify_iter_params(apiparams)
113-
return self._origin.iter_values(_path, requests_params, **apiparams)
113+
drop_key = '_key' not in apiparams.get('meta', [])
114+
for entry in self._origin.iter_values(
115+
_path, requests_params, **apiparams
116+
):
117+
if drop_key and '_key' in entry:
118+
entry.pop('_key')
119+
yield entry
114120

115121

116122
class _MappingProxy(_Proxy):

scrapinghub/client/requests.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from .proxy import _ItemsResourceProxy, _DownloadableProxyMixin
44

55

6-
class Requests(_ItemsResourceProxy, _DownloadableProxyMixin):
6+
class Requests(_DownloadableProxyMixin, _ItemsResourceProxy):
77
"""Representation of collection of job requests.
88
99
Not a public constructor: use :class:`~scrapinghub.client.jobs.Job` instance
@@ -54,4 +54,4 @@ def add(self, url, status, method, rs, duration, ts, parent=None, fp=None):
5454
:param fp: (optional) string fingerprint for the request.
5555
"""
5656
return self._origin.add(
57-
url, status, method, rs, parent, duration, ts, fp=None)
57+
url, status, method, rs, parent, duration, ts, fp=fp)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
eJylletXE0cYxiPiDbRitVXrLaZCU2Rz45KIUspdiBgIQUbrVodkyCwku/vuBQRNq9Vqi7W1Vnu3Nz/2m6ee47eek3zpn9V3Z4NQGmtLA0l23p2dy/P8nsnVqgJ4/GSTx+OZZYapaCqsi68jW7GtqBYzaNrCmglVMqz3F6Da7WowsJlpwYYCbPSTjVjJM4trGdhEqrExkhhLwWayHi9tQ4Et5AheccvS24PB5uaA+98abo+FYqEg1ZWgYauBaRPnrhHPT2qZeaglw3ipG9o0S1sdEffVYOpKhhkd3JQsXIDkNhtwdtpRH+2uj0RMi1oMv+ubu47iF46sKmrWKUR7YatYPWcUHzJhWwFe8pMarIybzJC6sky1YLsMdWSPM/M87kiVzLSBK1Sz3J4MRgKhQAh2ULId73el00y3pD41rWXwPrwsw06yDW9kFxS9yZthUzlcCeyiQh+3N7wiw6tCl8ZgI+ymYvIeTVWZkBn2yLBX1GYY0yWaU2YZvOYO0KNpMwqDfTLsJ3Fsp01jytJmmBrpIJPRScO0BzL6eEpLLCQV3puKmqnYdEvvpD5rTmjx8czseDLdFpsKzU7TqXi8O5GNRZr72ybUsYnWPjhAyUvuQiyUQDrF1KzF4aAMh0gV1qNR8FKBxFKP1LzO4LAMPnIYq1TXc0qaOjsIXpLm5uakKc3IS7aRY444LAOvU6FMl42SGsqC6ApHZKgnESx3U1NJe8/l/+3f2TZooLZNNgsSTR35ZPBGAfwuig4BtglvFqDRL3By1gBH438I8/PMNGmWQZPYWiIOks0RhIDbtdexLChDiBzAVspmTd5wzNulG95IKBz1hmLtrcfa8WJgOAVhSjY4m8rltDmIyNAs9uiw3+RNjKQGE6fHoKWCbq0ytJG6VboJ+qNULOIMNeYhJsMx4YpLTpO3DEC7i8MYMzCvcFyGE2Q/tifGBgbdWjAUiHh7RgS9weZAS6ANOqjNawvwVlkew8G1kzRg47LPVcvX7tNmfE2+aW1SyWCjHLdgOBiL+grwtmnbBejycwx8t5+vSHkP30JOLKfbtDQD1Q3M5gMrghNIa/mgYrG8GVw5cCfObVgdIejltekLjktps8ZFpgb6yBAOe6h4e7NnqvSg9IRUlX4v/nqmtHhqtPg4GSrdHR0ZGmwarI6UrhV/K15LShOtvaXFumF8H2bFGw2suni/ylNXvNNeujWKI0G/2D1mUlHDMHATTiZh0HF+6G9HQFyGU/98BAxTjnE/XSHuCcox4yN8N+UY5lGO6a0TCLoAsKXTIinDmFDReRxSlGPaxgWSrVE4QzmGY2Kt4SAYDo55OOvnGIJzfo7s82e8vyN4P++vFHlZhnfJOqyH4AIl+8r0mabk9DO0nCRglxKGklVUuCgDFb0bYbIC52kZMmQvVi12yQrqOaqox71pTg2TWR3jqX4pBswFc4p3Eo/jUVZwxgVnisOZc1QO9KVgGjFrWSNmMMNrTzt7zvk5Wpvnrnsqd73Syl7p6JUjO6xVdqMsuylkt1bJbgvZZ/0ChyWdnv14zMlwaRmH+RdrvyDDZV5J9SsyFES0/3oqO+dLTlGZudqC9yqe/e/LcNWlsRWuuSZ9wDt5H+ldCqX7epbICAbSyWOq+LhqbONQ8cn50oOL0LMLeopPi093FBfxY2S/p/To6M6DJx2rr3PM4I0kfCgsvyksv7XS8o/Q8sT/O1nKpfpIfxjfsSh+RODjMg2LgobbZRo+KdNwp0zDp2UaPlsrDXfLNHwuaLi3ioYvBA33n0PDAxm+XKbhqxfT8LUM31Sk4VsZvvsvNHxfkYaHMvwgVt4Sgh9dGn4SNISfS8O9ZRr6HRo8peulh1cM51SFnx3rf0nCI7Se2YE/AcxkTf0=
1+
eJyllflXG1UUx1PEWlur1LWKS4qCsTJZJoQEMLaUpUJKA0mAoTrWx+SRN5DMzJ0lQDVabN1a6173ui9Vj56jx989Z+YX/yzvvAkFK3WpSSYz786bt9zv537nZEsDQhHpulAoVKempeoabMttk27AtqrZ1CSKjTELWmS4JtKA1qCrScGhlg3XNmB7RNqOkRq1mV6G66RWbEzmiyXYIV2Dl46pwvXSA3jFbNvoj8WSyWjwSyX6M/FMPEYMNWY6WnTRwrl38ufn9fIq7JIm8NIw9UWq2Fkx+HRZhlqmZpZZgo0LEIJmF85Osp3pQ52iaNnEpnjuTA4+jCccWVO1ih9ID8MNfPWMEnzIgt0NuDEi7cTItEVNYbBCNRtukqFN2uvPvIo70gRLMXGFWoU58zExmojGYQ+RbsL7g4pCDVsY0RS9jPfhZhlukXbjjcoJ1egOl+lCFVcCtxKen6A33CbD7Twv+2P74Q7CJx/SNY3yNMNeGe7ksSVKDYFU1TqFu4IBhnR9SaXQLsPdUg7bimUu2PoS1cSsNJ+eNy3ncNmYLun5EwWVDZfSVimz2DM8b9StWT03Xa5PF5TezEK8vkgWcrlD+UpGTI72zmrF2dQI3EOkG4OF2JgC4QjVKjaDe2W4T2rBeDoNYcKRWO9RWjUo7JOhQ9qHUWIYVVUh/g5iK8Ly8rKwoJs1wTGr1E8OLcP9hGdm0MGUmuoJ3hUekKFTEjF8iFiqEj5W+7ffuV7oIo4j7eAkWgbySeHBBkQCFH0CHAseasD+CMfJXwM8nPudi1+jlkUqFLr51vI5EByGIEQj0rX+VqpVfRliMsT5gn2Qu8P5ydJY/mgREoESyAqWCogyJPmITl1VdFODHsJnK/uqp2Tole7BVsmh3WExGR40zLAYT/SFRbG/J9Pf0xs+PFGCdJBWpZlW209rRoY+qe2ytPLi6A9kWu9dDWQakOERvpdkH2SDJdSJuQqPynCA9w/Q6w43CToYUGdRW1CCyKAMh6TPNjMllGl9Xl/JThVXV4cWyGBmZm6mYE6BlanNJHr6tHw9qaVS6ZHl2tJcZShlZ1hyWh3LxLXizNG4dWzlMcVIlOfMxECYrhgqapQN8pBo5kGM/ykPA+EJsuLXXzaZ6Onp643HB8KTxGbZ2EC4SGq0qNo0e4SswBBx2K4GDDd1Nv26G5EexMbTHYHsHf0d+lJHd8eiPq+WsdH0jVgiJmbSHQ0YtRynAYcjDK3rsQjb5Fdj7Hopu+FTlq2byEm0XotusoCootdiuJqaFfvTyAdwdtPOxmGc7VKO+8Ap1s6A/p2Qk8Zx3PvcsztCefdd97cnWrzf3B9mvDNHptxfCnHvjanJ8bHusVbRW3N/ddcKwmxq2DvTNoHHPuqe7qKt7jstoTb3XL/30hSOBEf4/tFeVC0BEy/C0QLkfYgn/+JmUzIU/t7NioShc5W2cK5pwtCuZtgdhKEvzTI0orZN+NF145NkmONp9B+HY4ShcTzOiUyl4QnCsM7lq63zJ7HOGZb28QjDen4qwrCM2aXSJbx05yNSexNzyxJ8izL1qjDoV7KQN9WKqoEiQ1na5tsu0C29bkGGCu8QB7aF1akyLEp3YtSmK3bMqBJVGwgrjJhYRdnp0qiQgaUAzSobkUK+RjUOmsZB033QfNc/PFICAzk7cNWc8Tfd8SW6CsB2HfW3b0YYqmyxQEibBbI5TdnqKJuvwPLVKrDSVGCVK3DiMgWe5go8888KNGR4lm2d++dkOMnHyyRgLWBsvcell+vzMpzaYOz0FhK9IMOLUtdf3ka+cVZVjVqX6/VSoNfLbITlpNp6fQafS8UpYm36pVlyf2kpbh/vH/d+9j5wv3PPH3R/2tPqXWz3vm+fc9/3fmiPeOfNafdUaq/7BYt7p92vvbU29ydvbceIe2pPdPfowd2h4+7n7kX3R/dtH49XGNbtmQKc5Zi8yjE5txmT1xCTx/+nHTVjneJoAg+M+/9dGwi93kToDY7Qm02E3moi9HYToXeaCJ2/WoTebSL0Hkfo/csQ+oAj9OE/I/SRDB9fAaELMnzCx+uNw6dXQOgzGT7fQOiLLRD6Uoav/gtCXwcIfcMRmrwiQm9tIDT6dwg9hAhtC7kXvAvuR963CZ+Sb31KLhbgO6SEOtE/AHk0vqQ=
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
eJy1lvl7E1UUhkOssrgVd6xLiLQG7GRvU4JRSvdC6ZbCFR1xmtzmTpPMzJmlCxoVcUHcEEHFfRdQURD3BZ35xT/LM3dSCiV94KmPWeee3PX73nMmT/sr4AuR5T6fb4rqhqwqsGzrMnINtmXFpLqUMzFmgF+EK0IVqPO66hQsaphwZQWu8iKMSnkcD8srsCJErsNIh4rjFVPYRpWCyWClCKuIH+OpFFwtkVV4NWZQXWgvYCe4RoRryZ0Y02ZNpiqCkdMlTVYKzBqPxMNRfObpVBSuk8i12Kndwk66vEdy9wbXi1BP4hjeIhlyLrCrfLnPh1phtUSudyfM5ahmCl1KTs3jqnCDCDfylQp7ZK05kKcTJcmkcJPEhZk7WXZWo3CzCLeQtRiVNK0k5/iWIjPC9PS0MKHqZcHSS9SdlubhVolcdW4xuE2ENeQKbG+IbIDbPUVwZoVyxaFBhDt4rEipJkgleYrCnZLFR1i6DHeRda7spqmlI5FEIuy9WmLptmhbNILiRXRLCU8aONXdfNkyRdHyECB12BgaHM3CWn45ruZnIUgG8NLQZDQxwwzBRHcFr9mk6eokbioT9x5NOJGUaUxtaYzHDRNlwe/GRPt9+IUrKiifG0h1wj0WWcFZMTQkiMK6CjSGGALSFOILd7qS3itCiBvfrcvNgXgyMCDpgXg0lgrEEml8xVsDPQNZWC+RK13pSiV1GjaIcB93xz1Fc2BwKNs3uH0Umj15R6mOJIMgQpjcge2doz19XiwSDccDHUOcsEginAy3QqSGo1ERYqR+gaNcyLjEN75D0mchIUKSc+7Z2RzoUNWiTKHFc3KUmkI10ipCiryMsZyhT5hqkSrxTNnUrBQM7xrZ3tk+npza2L9jHGC81yQzMXOg1zCJOaaUeyaN7uLYxEyHVCj0ju3cQrvaJge6SHyMRjcF6Iwmo7QZT7eEgLoJqFvbBbptQjln3BTLJGLJ5MbWKA4ckkyWiUCbZLFgBTZyzQxTd7FPk3ux8XjQtdUygumgWgw2ByfVcTmPjar/kVgk2daKQzcZ1bFuZ7i/AhnPVxd2eGDrP7wulKlhSAUKD/LcH9wKmy3LqkB7iGHt2MJx6AgxLA6dvENLCrouKg7dIvRcRnHolRiWgr6lloJ+iWHab62R9tskhsk6wDBJ6/n5PFjoXLXYLsIgP7k7DIYkhrk7zDBZ2V0kM5+khqnqKEV4qhw+7wThnFqOyCYtG5ELBH4QddXNTBRG2HkpO8qCud2uwDljlVdWVkGW9OHPd9svrfBNNzhHiN85a3+1wzmwbdg+PRJ1Dg4P9fc199XFnb32GXvviLCzpdM5UD+A77XUfraJ1tmH/b56+5W088IwTgRj3FY8uazEYMfzsHMEiMUwex/idu0KkYYq9oYhuJmjqyWBZ6YwqMsFWYGHRXiELHNLG4hSrZvBoyLs5h2i8FiNDJREGCdrMGrSGTOilSRZ2RTIMUk3qJkZy3YLbZDz8M2zNPG5m6YGQwInQgzBY+dgK3DYGIdN5rufDDHEqch6uUsldMn1tkxuvqiCl42CJuWKoHCs1KVipXGsgG3jOLQsFQfQEQO39vd0ZcFgwe3cEZOfybq0I1MiTLPaXsyIMMv1SrbCnhpmPC7CE/xeU1Oehb5UvByZm+HcHfVJEZ6az5GnPff2sjTLkvvn6PUexV32Yfuo84z93bpG+9Q6WG/vjzK/c3rN6ic66u0PVzp7U36f86ez3/7VPhZ1vX+GIaX7RuBZzsBzCxh4njPwAmdgP9frRc7AgSoDL1UZeJl5Tr+yVKdf5U6/VnV6+D8mfjXWGO+O4Rvj+BmHg+dR8PocBYf4qd64NAWHRTiyCAVvivAWVyyRhLdrUHBUhHcun4J3F6HgPRHen6fgA4+CDzkFzYtQcGaeAr9vhb3f3ue85s4NH7mufzwCn3DXP13g+mfc9c+5619wfb7krh+run686voJrOqu618t1fWvuevfVF1/+P9w3fvHtbtIZ+Hkef5/O+f/d/x8py7t/2kRvl/E/zMi/MC1a43CjzX8/0mEn0nTRf67f4tKskKNhQT8sggBv4rw2zwBv3sE/MEJGLqQgHP3sLhzaNi9g2Xt0/7R7v50v3PKOWoft49stk+urnOONTgn7HeJ/bZzvGG9c0Rf5rPPLrePOSdiLiV/upScHYG/OCV/L6DERkqoFf4XRtAs+A==
1+
eJyllul3E1UYxkMpUvaCIiAiodISIJNlQpu0GLE7pbRp07S9LQw4mdzmTpPMzDtLumAUEAGLKCqiIIsreo7Hc8SDH/wi50y++Gd5505KEYpw6mSZue/cucv7/N4nOV1VAo8PrfR4PEWsG7KqwLLeZWgtbcuKiXVRMmnMgCoBlvtKUO121TFY2DBhRQle8KEXaKSATaJmYCWqpo2BxFAKatByemnpMqxCu+kVMU2tJRiMRALuuzHcEgvFQkFRk4O6pQQmDTr3avZ8Ws3MwBrURy81XZ3Ekhnn3aPB0OQM1uPE4Ey6AM5tNtDZxXh9tK2e5w1TNDE910da99MTHVmRlawTiHbAWrZ6gkX6kAHrSrDeh1bTyLCBda41ixUTNghQi7Y6M8/QHSmcIel0hUqWWOkgHwgHQrBRRBvo/VZJwprJdSqSmqH3YZMAL6J19EZ2Vtb83gyeyNOVwEsiy4/bGzYL8DLLy77gPtgissnbVUXBLM2wVYBtLJbDWOPEvFzE8Io7QLuq5mQM2wV4Fd2mbcnQJ0w1hxUug4tpdTo+ODQz0z4htsZGxkaS+iAYscJI+ECzkihGlMbGaOdUITeWbW80YyQyLPfEQsrQSH/IGJ8+LGnhzJgePuh9OCQfR+loWjes7ow2nFITs0mZdKSiRio2eaAjrRWNUbV3OFMcTkpNsYlQcVKc6O1tS2RjfKSraVQZGm3shB0iWu/uzaRZ5Y5iJWsSeE2AnaiKxqNR8IqMsvkeqRkNwy4B6tAuGhU1LS9LopOU4DQ3NTXFTah6gbP0PHbyjTPwusiS3WpRlXR5lnWF3QLUI56G20RDlrzjhed9jTVBg2hZqIbBbWgUeQx7SuBz6XagsgzYW4J9PkaoswbY3/s346mADUPMYvCzrSV6gbMIZSvgQyucreTz6hQEBQixBTu14fcmBlI9if4hCLviUvxo9QEvQISNaBVlSdUVOCCy2TIOSI0CNKEdtJWysN/LR7ytmu7lQ+FmL8+3HIjRt7e7LwVRN61SJa2mk9aYAM2o9rG0snprcWWa7513ZToowBtsL5FmiLtLKIr6DLwpwCHW36XZ761A+ZZokTUlaK3kSnfKoQ3toY1TdW7q6lrq1Fydv25STcsZ2qiUczAc5GOxuhK0G5ZVgg4foY7S6SOP2EgXWYXiC/ZhmKpOcx0oFgKPVGZAUgtB2cQFI/ivkQ/R2XUzHoJuskY66YgmGatdglbDYXSEjrvTvlTjSdrX7AfHq8oP7F9GynNHB+3fk6HylcGBIz3+nmq+fMa+b59JcqONHeW52j762YXtcw242r5a5am1L7eULwzSkaCH7Z9WvayE4ch56E3CUQeEvidMpl+AxH+bzIBIqKEMLmIoSZFQFxkiW0RC7SJFqD/UPiIhnvejYQFGWBqdx2FUJLT4EFO1MQpjIqG1Mr7UWjlGa4XQ8jjuI7QmBB+hpUAe4n+C4X/Sh7ZXUDEMzilzXc1zrU41cAldzsoKvC2AiJY5bgjpRf1CEiDDOoQAL2IXEwJk0TYaNfG0GdTyoqxQFyOibmAzPpzq4mJAXDRl0oY8jkaTDLQcAy3vgOaYcXdnCgqUs0NL5oz9AJ3M4RlQyJp+Z/uqj1CVNeIKCcSVTUebn3C3gpHVRCkHBhPUpII62lhL1aZY0WaKaTP9mDYzTJvZZ2tzSoB3yOKqlAR413XxELzn0jff4+Gv4WkBzizQd3YR8d4X4Bz7Y7BoNh7X8QNXx/OkjRxGJ+br1j1yJ+yr9vXyWfu33fX2vd2w174YQpvsO/atcfvP8u2aqvL9deU/7Mt+P72wb9hn7LmtG+25tfa9vXz13nSbj6fP3i1frPHYP0cG9qsOJxcILeCLSfiQ8TLHeLn0KC8fUV6O/U9fqsTq+a4w/dC4892wwNLlCksfM5Y+qbB0pcLSp8Ql5rMKMZ8vlZirFWK+YMRce4yYLxkxXz2bmOsC3HgKMV8LcNO1nhDcegoxtwW4s0DMN4sQ860A3z0/Md+7xPzAiOl8CjH3F4gZfwox9mVP+WbS/tX+q94B40cHjLtJ+ImCga3APzaVm8M=
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
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
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
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

0 commit comments

Comments
 (0)