aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-07Snap for 10453563 from 750c37cb48b76444c8fba410aaea44d4f45365de to ↵aml_sta_341615000aml_sta_341511040aml_sta_341410000aml_sta_341311010aml_sta_341114000aml_sta_341111000aml_sta_341010020aml_sta_340912000aml_sta_340911000aml_net_341111030android14-mainline-os-statsd-releaseAndroid Build Coastguard Worker
mainline-os-statsd-release Change-Id: Ib50556e2c1c0a8acf76f872f469364bd59536611
2022-09-21Remove Python enables identical to global defaults. am: 0d2f7eaee7 am: ↵HEADandroid-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000mastermainandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseKrzysztof Kosiński
5ea2095d0f am: 10706cc50c am: e4bb05f075 am: 633046b46b Original change: https://android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/2222462 Change-Id: I031ec756388ad865920e9371d111b9cf68cf3670 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21Remove Python enables identical to global defaults. am: 0d2f7eaee7 am: ↵android-u-beta-1-gplmain-16k-with-phonesKrzysztof Kosiński
5ea2095d0f am: 10706cc50c am: e4bb05f075 Original change: https://android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/2222462 Change-Id: I83d32f305426ef01187d2ea1538e679d3e9e882b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21Remove Python enables identical to global defaults. am: 0d2f7eaee7 am: ↵Krzysztof Kosiński
5ea2095d0f am: 10706cc50c Original change: https://android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/2222462 Change-Id: I3b00638eef3e7f77c3ae44d2777ff33804ebb000 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20Remove Python enables identical to global defaults. am: 0d2f7eaee7 am: ↵Krzysztof Kosiński
5ea2095d0f Original change: https://android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/2222462 Change-Id: I6215571ce50d46876e387bc92295cac03649971b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20Remove Python enables identical to global defaults. am: 0d2f7eaee7Krzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/2222462 Change-Id: I98da9e71e747bc0d60e442974694ff420078af01 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20Remove Python enables identical to global defaults.main-16kKrzysztof Kosiński
Bug: 245854393 Test: presubmit Change-Id: If9173cb9f0d48ee915d5736922ea566dfa5c6be3
2022-06-20Snap for 8746144 from ff9e945e1b5b5966cfc75b3c954e62076ea9ea00 to ↵aml_sta_331910000aml_sta_331811000aml_sta_331711010aml_sta_331610000aml_sta_331511000aml_sta_331410000aml_sta_331311000aml_sta_331010010aml_sta_330910000android13-mainline-os-statsd-releaseAndroid Build Coastguard Worker
mainline-os-statsd-release Change-Id: Id2e1858eabb529428b8f62882d0bcf79a46d4690
2022-06-09Merge remote-tracking branch 'goog/mirror-aosp-master' into bp_timeout am: ↵Frank Feng
e2a8f4c150 am: 7805d425ee am: bc2d4c9d3c am: 7f82f51280 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/18819311 Change-Id: Iec1747b6f869fce047002634814b7ad5a3a496f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Merge remote-tracking branch 'goog/mirror-aosp-master' into bp_timeout am: ↵Frank Feng
e2a8f4c150 am: 7805d425ee am: 0a5930e706 am: 1f01f8f957 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/18819311 Change-Id: I78ed6a67117d72958e4d2dbe38513f6b8d83af32 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Merge remote-tracking branch 'goog/mirror-aosp-master' into bp_timeout am: ↵Frank Feng
e2a8f4c150 am: 1ed27a90ac am: ba53af7e42 am: 8150fbd9f7 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/18819311 Change-Id: Ic1757843f3f117278186dc011d643dab34f4189c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Merge remote-tracking branch 'goog/mirror-aosp-master' into bp_timeout am: ↵Frank Feng
e2a8f4c150 am: 7805d425ee am: bc2d4c9d3c Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/18819311 Change-Id: Id645815e84b3250e2a7d9763311e31bfae32bccd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Merge remote-tracking branch 'goog/mirror-aosp-master' into bp_timeout am: ↵Frank Feng
e2a8f4c150 am: 7805d425ee am: 0a5930e706 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/18819311 Change-Id: I7d34001ecb38cd474e254602d13471c88ea13cbb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Merge remote-tracking branch 'goog/mirror-aosp-master' into bp_timeout am: ↵Frank Feng
e2a8f4c150 am: 1ed27a90ac am: ba53af7e42 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/18819311 Change-Id: I7f676133ac91e271a4d368735382b02959cc0a2c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Merge remote-tracking branch 'goog/mirror-aosp-master' into bp_timeout am: ↵Frank Feng
e2a8f4c150 am: ff9e945e1b Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/18819311 Change-Id: I3abda2b9b6812841f82c0ea5f89c117d20881241 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Merge remote-tracking branch 'goog/mirror-aosp-master' into bp_timeout am: ↵Frank Feng
e2a8f4c150 am: 7805d425ee Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/18819311 Change-Id: I52ebb006c8539a15c0a12ba91c72196799536ed4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Merge remote-tracking branch 'goog/mirror-aosp-master' into bp_timeout am: ↵android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseFrank Feng
e2a8f4c150 am: 7805d425ee Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/18819311 Change-Id: I823b8095e352ef94989293db16d63231f699f031 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Merge remote-tracking branch 'goog/mirror-aosp-master' into bp_timeout am: ↵Frank Feng
e2a8f4c150 am: 1ed27a90ac Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/18819311 Change-Id: I03a1b5e96c8ad85349d66665888989b5cdfd0342 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Merge remote-tracking branch 'goog/mirror-aosp-master' into bp_timeout am: ↵Frank Feng
e2a8f4c150 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/18819311 Change-Id: I0671d8d0948d4b32b40fb4a1aefa854efa9a592e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Merge remote-tracking branch 'goog/mirror-aosp-master' into bp_timeout am: ↵Frank Feng
e2a8f4c150 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/18819311 Change-Id: Ib5372b3ac52ad326117c7dd950723d6043a918e4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Merge remote-tracking branch 'goog/mirror-aosp-master' into bp_timeout am: ↵Frank Feng
e2a8f4c150 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/18819311 Change-Id: I5ed9380814902daa0df0c2bd1a8e9504801f77ad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09Merge remote-tracking branch 'goog/mirror-aosp-master' into bp_timeoutandroid13-devFrank Feng
Bug: 235099911 Test: TH Change-Id: I82bfe25cf9e83c7e099b69273fdac887cc89269d
2022-06-01Add build files for timeout_decorator am: 12b00c2d63 am: f0db9c8704 am: ↵Julien Desprez
3723f8f307 am: b357c5325c am: 46a87d987a Original change: https://android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/2112185 Change-Id: I43d78e143172ebb0f46346ede844dd7c73f6693b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01Add build files for timeout_decorator am: 12b00c2d63 am: f0db9c8704 am: ↵Julien Desprez
3723f8f307 am: b357c5325c Original change: https://android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/2112185 Change-Id: I290d6bb29dd70168b08576eea89c756881078ce3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01Add build files for timeout_decorator am: 12b00c2d63 am: f0db9c8704 am: ↵Julien Desprez
3723f8f307 Original change: https://android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/2112185 Change-Id: Ieff6fab89c1a9d42be960c8c34268336aa124164 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01Add build files for timeout_decorator am: 12b00c2d63 am: f0db9c8704Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/2112185 Change-Id: I66977e1a67f2e7afb394dff4c102bd30f69d1f1d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-01Add build files for timeout_decorator am: 12b00c2d63Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/2112185 Change-Id: I0dbfe80717582d05dcd079fdd46a9260a7b4bc88 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-31Add build files for timeout_decoratorJulien Desprez
Test: presubmit Bug: 234458076 Change-Id: I0c1b73462637310021ba93c5acae6375ecd501d3
2022-04-28Merge remote-tracking branch 'aosp/upstream-master' into timeout-decorator ↵frankfeng
am: a77f26f116 am: 6a38905745 am: bb0a49a149 am: f182c233af am: 584ded1a34 Original change: https://android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/2072124 Change-Id: I5bb59e73294740d7e7878e60111c87ce404f0abe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Merge remote-tracking branch 'aosp/upstream-master' into timeout-decorator ↵frankfeng
am: a77f26f116 am: 6a38905745 am: bb0a49a149 am: f182c233af Original change: https://android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/2072124 Change-Id: Iac616692a3132016c19741231caad301809a0d38 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Merge remote-tracking branch 'aosp/upstream-master' into timeout-decorator ↵frankfeng
am: a77f26f116 am: 6a38905745 am: bb0a49a149 Original change: https://android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/2072124 Change-Id: I8704f4f4090b9cffa3f2f984c4b50bcbfb89588b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Merge remote-tracking branch 'aosp/upstream-master' into timeout-decorator ↵frankfeng
am: a77f26f116 am: 6a38905745 Original change: https://android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/2072124 Change-Id: Ic7bd3e6644c3f24ac6d0f8efd6ef680ae5ad0cdd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27Merge remote-tracking branch 'aosp/upstream-master' into timeout-decorator ↵frankfeng
am: a77f26f116 Original change: https://android-review.googlesource.com/c/platform/external/python/timeout-decorator/+/2072124 Change-Id: I6e8aadc8cf1947b45dec714386372a457c221934 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25Merge remote-tracking branch 'aosp/upstream-master' into timeout-decoratorplatform-tools-33.0.2frankfeng
Bug: 228457005 Bug: 225958696 Test: TH Change-Id: I96c55c324f786a693281ac261db04fcd91284cd7
2022-04-07Initial empty repositoryRoman Yepishev
2020-11-14Roidelapluie functionkwargs (#65)upstream-masterPatrick N
* Allow to use timeout in function kwargs even when initial seconds is None Initial support for timeout in function kwargs was implemented by 187ee34d9e0a571bcc7f9233208462634940f4c0 * drop support for 2.6, 3.4, 3.5 and add support for 3.7, 3.8, 3.9 * drop support for 2.6, 3.4, 3.5 and add support for 3.7, 3.8, 3.9 * WIP trying to fix bild * WIP trying to fix bild * fix build * bump version to 0.5.0 * bump version to 0.5.0 Co-authored-by: Julien Pivotto <roidelapluie@inuits.eu> Co-authored-by: Patrick N <patricng>
2018-12-05Fix a bug when using a custom exception with a custom exception message. ↵Taylor Alexander
Also remove tests for Python 3.2 and 3.3. (#55) * Fix a bug in the code when using a custom exception with a custom exception message. Added a test for this condition. * Fix line spacing lint error. * Update CI config to remove Python 3.2 and 3.3, which are no longer supported by tox. * Remove python 3.2 and 3.3 from travis config. * Bump version number to 0.4.1. * Also update version number in init file to 0.4.1.
2017-11-06Merge pull request #40 from boynedmaster/patch-1Patrick
Update README to be updated with Python 3
2017-11-01Update README to be updated with Python 3boyned//Kampfkarren
Used the new print function instead of the print statement and changed deprecated C-style formatting to format.
2017-08-14Merge pull request #36 from joshddunn/masterPatrick
Set custom exception message in decorator
2017-06-11Bumped version to 0.4.0Josh
2017-06-10Can set exception message in decorator.Josh
2017-06-10Can set exception message in decorator with Travis CI fixes.Josh
2017-06-10Travis CI fixes 2.0Josh
2017-06-10Travis CI fixesJosh
2017-06-10Updated .gitignore to ignore .vscode/Josh
2017-06-10Can set exception message in decoratorJosh
2017-04-13Merge pull request #35 from k2fong/class-method-supportPatrick
Class method support
2017-04-11fixed an issue where the _Timeout was calledPeter Fong
2017-04-11Added unit test to cover class method casePeter Fong
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 21:59:03 +0000