Skip to content

Commit

Permalink
Merge pull request #61 from plone/akshay-unittest
Browse files Browse the repository at this point in the history
Remove unittest2 dependency
  • Loading branch information
jensens committed Jun 12, 2017
2 parents 1851518 + 17c12a8 commit 24c45e9
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ New features:

Bug fixes:

- *add item here*
- Remove unittest2 dependency
[kakshay21]


3.0.23 (2016-11-26)
Expand Down
2 changes: 1 addition & 1 deletion plone/protect/tests/testAuto.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from zope.component import getUtility

import transaction
import unittest2 as unittest
import unittest


class _BaseAutoTest(object):
Expand Down
2 changes: 1 addition & 1 deletion plone/protect/tests/testPatches.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from plone.protect.testing import PROTECT_FUNCTIONAL_TESTING
from plone.testing.z2 import Browser

import unittest2 as unittest
import unittest


class TestCSRF(unittest.TestCase):
Expand Down
2 changes: 1 addition & 1 deletion plone/protect/tests/testUtils.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from unittest import TestCase
from unittest import TestSuite

import unittest2 as unittest
import unittest


def funcWithoutRequest():
Expand Down

0 comments on commit 24c45e9

Please sign in to comment.