From dabac6a4ed3a8b0794e66fe41acdd93b3a101618 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Mon, 14 Dec 2015 22:08:53 +0100 Subject: [PATCH] use mock from stdlib, fixes #145 --- borg/testsuite/archive.py | 2 +- borg/testsuite/archiver.py | 2 +- borg/testsuite/repository.py | 3 +-- requirements.d/development.txt | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/borg/testsuite/archive.py b/borg/testsuite/archive.py index a963573ec..662d776c9 100644 --- a/borg/testsuite/archive.py +++ b/borg/testsuite/archive.py @@ -1,7 +1,7 @@ from datetime import datetime, timezone +from unittest.mock import Mock import msgpack -from mock import Mock from ..archive import Archive, CacheChunkBuffer, RobustUnpacker from ..key import PlaintextKey diff --git a/borg/testsuite/archiver.py b/borg/testsuite/archiver.py index f75cc120c..74e41152d 100644 --- a/borg/testsuite/archiver.py +++ b/borg/testsuite/archiver.py @@ -11,9 +11,9 @@ import shutil import tempfile import time import unittest +from unittest.mock import patch from hashlib import sha256 -from mock import patch import pytest from .. import xattr diff --git a/borg/testsuite/repository.py b/borg/testsuite/repository.py index 7027cb59a..3da7b80ff 100644 --- a/borg/testsuite/repository.py +++ b/borg/testsuite/repository.py @@ -2,8 +2,7 @@ import os import shutil import sys import tempfile - -from mock import patch +from unittest.mock import patch from ..hashindex import NSIndex from ..helpers import Location, IntegrityError diff --git a/requirements.d/development.txt b/requirements.d/development.txt index bf21d52a2..7c1624b4d 100644 --- a/requirements.d/development.txt +++ b/requirements.d/development.txt @@ -1,6 +1,5 @@ virtualenv<14.0 tox -mock pytest pytest-cov<2.0.0 pytest-benchmark>=3.0.0