diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-10-05 22:37:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-05 22:37:26 +0000 |
| commit | 63405117741c1cb18d1a4a21e73dca621601f1d8 (patch) | |
| tree | fbff58c149c4ae3537c609151b191631451b62e0 /mock/tests/conftest.py | |
| parent | 6c3b8f78baba1271ef10f59655c4882694fa2f29 (diff) | |
| parent | 973c30bb0b23d5b56b3c4450d296952067f25246 (diff) | |
| download | mock-master.tar.gz | |
Merge "Remove pymock now everyone's on python3." am: 973c30bb0bHEADandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1mastermainandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
Original change: https://android-review.googlesource.com/c/platform/external/python/mock/+/1845269
Change-Id: Iaeb2bccf226919d60708e5f081183e4564007429
Diffstat (limited to 'mock/tests/conftest.py')
| -rw-r--r-- | mock/tests/conftest.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/mock/tests/conftest.py b/mock/tests/conftest.py deleted file mode 100644 index 78831f6..0000000 --- a/mock/tests/conftest.py +++ /dev/null @@ -1,6 +0,0 @@ -import six - - -def pytest_ignore_collect(path): - if 'py3' in path.basename and six.PY2: - return True |