python-pylink-square/trunk/python-pylink-square-0.14.3-remove_mock.patch

   1 diff --git c/setup.py w/setup.py
   2 index f87b026..6312871 100644
   3 --- c/setup.py
   4 +++ w/setup.py
   5 @@ -263,11 +263,6 @@ setuptools.setup(
   6      # Tests
   7      test_suite='tests',
   8
   9 -    # Test requirements
  10 -    tests_require=[
  11 -        'mock == 2.0.0'
  12 -    ],
  13 -
  14      # Additional scripts.
  15      scripts=[
  16          os.path.join('examples', 'pylink-rtt'),
  17 diff --git c/tests/unit/protocols/test_swd.py w/tests/unit/protocols/test_swd.py
  18 index 03652f6..1a74455 100644
  19 --- c/tests/unit/protocols/test_swd.py
  20 +++ w/tests/unit/protocols/test_swd.py
  21 @@ -15,7 +15,7 @@
  22  import pylink.protocols.swd as swd
  23  import pylink.util
  24
  25 -import mock
  26 +from unittest import mock
  27
  28  import unittest
  29
  30 diff --git c/tests/unit/test_decorators.py w/tests/unit/test_decorators.py
  31 index ba2096b..2430cc3 100644
  32 --- c/tests/unit/test_decorators.py
  33 +++ w/tests/unit/test_decorators.py
  34 @@ -14,7 +14,7 @@
  35
  36  import pylink.decorators as decorators
  37
  38 -import mock
  39 +from unittest import mock
  40
  41  import threading
  42  import unittest
  43 diff --git c/tests/unit/test_jlink.py w/tests/unit/test_jlink.py
  44 index fa7c32f..8beb2b9 100644
  45 --- c/tests/unit/test_jlink.py
  46 +++ w/tests/unit/test_jlink.py
  47 @@ -20,7 +20,7 @@ import pylink.structs as structs
  48  import pylink.unlockers.unlock_kinetis as unlock_kinetis
  49  import pylink.util as util
  50
  51 -import mock
  52 +from unittest import mock
  53
  54  try:
  55      import StringIO
  56 diff --git c/tests/unit/test_jlock.py w/tests/unit/test_jlock.py
  57 index 7913b86..7492900 100644
  58 --- c/tests/unit/test_jlock.py
  59 +++ w/tests/unit/test_jlock.py
  60 @@ -14,7 +14,7 @@
  61
  62  import pylink.jlock as jlock
  63
  64 -import mock
  65 +from unittest import mock
  66
  67  import errno
  68  import os
  69 diff --git c/tests/unit/test_library.py w/tests/unit/test_library.py
  70 index fb92f92..3b06800 100644
  71 --- c/tests/unit/test_library.py
  72 +++ w/tests/unit/test_library.py
  73 @@ -16,7 +16,7 @@ from platform import platform
  74  import pylink.library as library
  75  import pylink.util as util
  76
  77 -import mock
  78 +from unittest import mock
  79
  80  import unittest
  81
  82 diff --git c/tests/unit/test_main.py w/tests/unit/test_main.py
  83 index 9b50396..c9cadbd 100644
  84 --- c/tests/unit/test_main.py
  85 +++ w/tests/unit/test_main.py
  86 @@ -16,7 +16,7 @@ import pylink
  87  import pylink.__main__ as main
  88
  89  import logging
  90 -import mock
  91 +from unittest import mock
  92
  93  try:
  94      import StringIO
  95 diff --git c/tests/unit/test_util.py w/tests/unit/test_util.py
  96 index c60d6da..67f70a0 100644
  97 --- c/tests/unit/test_util.py
  98 +++ w/tests/unit/test_util.py
  99 @@ -15,7 +15,7 @@
 100  import pylink.enums as enums
 101  import pylink.util as util
 102
 103 -import mock
 104 +from unittest import mock
 105
 106  try:
 107      import StringIO
 108 diff --git c/tests/unit/unlockers/test_unlock.py w/tests/unit/unlockers/test_unlock.py
 109 index e625745..ce4f0a6 100644
 110 --- c/tests/unit/unlockers/test_unlock.py
 111 +++ w/tests/unit/unlockers/test_unlock.py
 112 @@ -14,7 +14,7 @@
 113
 114  import pylink.unlockers as unlock
 115
 116 -import mock
 117 +from unittest import mock
 118
 119  import unittest
 120
 121 diff --git c/tests/unit/unlockers/test_unlock_kinetis.py w/tests/unit/unlockers/test_unlock_kinetis.py
 122 index e1c0738..1e80f8d 100644
 123 --- c/tests/unit/unlockers/test_unlock_kinetis.py
 124 +++ w/tests/unit/unlockers/test_unlock_kinetis.py
 125 @@ -16,7 +16,7 @@ import pylink.enums as enums
 126  import pylink.protocols.swd as swd
 127  import pylink.unlockers as unlock
 128
 129 -import mock
 130 +from unittest import mock
 131
 132  import unittest
 133