From fc3492930ece8066bed4d621578e37480de47a80 Mon Sep 17 00:00:00 2001 From: jensens Date: Mon, 12 Jun 2017 15:58:36 +0200 Subject: [PATCH] [fc] Repository: plone.protect Branch: refs/heads/master Date: 2017-06-12T00:13:12+05:30 Author: kakshay21 (kakshay21) Commit: https://github.com/plone/plone.protect/commit/17c12a8d20b1dceaef00979abd87faa61a7ed815 Remove unittest2 dependency Files changed: M CHANGES.rst M plone/protect/tests/testAuto.py M plone/protect/tests/testPatches.py M plone/protect/tests/testUtils.py Repository: plone.protect Branch: refs/heads/master Date: 2017-06-12T15:58:36+02:00 Author: Jens W. Klein (jensens) Commit: https://github.com/plone/plone.protect/commit/24c45e91e35b43dee6371872901471eab50b9dec Merge pull request #61 from plone/akshay-unittest Remove unittest2 dependency Files changed: M CHANGES.rst M plone/protect/tests/testAuto.py M plone/protect/tests/testPatches.py M plone/protect/tests/testUtils.py --- last_commit.txt | 140 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 98 insertions(+), 42 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index b883d663a5..cec2b2f23a 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,88 +1,144 @@ -Repository: plone.transformchain +Repository: plone.protect Branch: refs/heads/master -Date: 2017-06-12T00:45:26+05:30 +Date: 2017-06-12T00:13:12+05:30 Author: kakshay21 (kakshay21) -Commit: https://github.com/plone/plone.transformchain/commit/58a6b2b3c22603d089a9a671e36f6793cd03db3c +Commit: https://github.com/plone/plone.protect/commit/17c12a8d20b1dceaef00979abd87faa61a7ed815 -Remove unittest dependency +Remove unittest2 dependency Files changed: M CHANGES.rst -M plone/transformchain/tests.py +M plone/protect/tests/testAuto.py +M plone/protect/tests/testPatches.py +M plone/protect/tests/testUtils.py diff --git a/CHANGES.rst b/CHANGES.rst -index f85ec88..a3055aa 100644 +index 7012a45..b227479 100644 --- a/CHANGES.rst +++ b/CHANGES.rst -@@ -15,6 +15,9 @@ New: - - Added events to notifiy before/after all/single transform(s) are executed. - [jensens] +@@ -14,7 +14,8 @@ New features: + Bug fixes: + +-- *add item here* +- Remove unittest2 dependency + [kakshay21] -+ - - 1.1.0 (2016-02-21) - ------------------ -diff --git a/plone/transformchain/tests.py b/plone/transformchain/tests.py -index 9314d66..efe7a3b 100644 ---- a/plone/transformchain/tests.py -+++ b/plone/transformchain/tests.py + + + 3.0.23 (2016-11-26) +diff --git a/plone/protect/tests/testAuto.py b/plone/protect/tests/testAuto.py +index 4454b80..e3394a4 100644 +--- a/plone/protect/tests/testAuto.py ++++ b/plone/protect/tests/testAuto.py @@ -16,7 +16,7 @@ + from zope.component import getUtility + + import transaction +-import unittest2 as unittest ++import unittest + + + class _BaseAutoTest(object): +diff --git a/plone/protect/tests/testPatches.py b/plone/protect/tests/testPatches.py +index 0b01ac2..3a17b56 100644 +--- a/plone/protect/tests/testPatches.py ++++ b/plone/protect/tests/testPatches.py +@@ -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): +diff --git a/plone/protect/tests/testUtils.py b/plone/protect/tests/testUtils.py +index e26381d..92bd1b6 100644 +--- a/plone/protect/tests/testUtils.py ++++ b/plone/protect/tests/testUtils.py +@@ -6,7 +6,7 @@ + from unittest import TestCase + from unittest import TestSuite - import os - import tempfile -import unittest2 as unittest +import unittest - class FauxPubEvent(object): + def funcWithoutRequest(): -Repository: plone.transformchain +Repository: plone.protect Branch: refs/heads/master -Date: 2017-06-11T23:14:59+02:00 -Author: Gil Forcada Codinachs (gforcada) -Commit: https://github.com/plone/plone.transformchain/commit/08c735e32955ae41b92d8e26c95f34e1fa50bfb7 +Date: 2017-06-12T15:58:36+02:00 +Author: Jens W. Klein (jensens) +Commit: https://github.com/plone/plone.protect/commit/24c45e91e35b43dee6371872901471eab50b9dec -Merge pull request #6 from plone/akshay-unittest +Merge pull request #61 from plone/akshay-unittest -Remove unittest dependency +Remove unittest2 dependency Files changed: M CHANGES.rst -M plone/transformchain/tests.py +M plone/protect/tests/testAuto.py +M plone/protect/tests/testPatches.py +M plone/protect/tests/testUtils.py diff --git a/CHANGES.rst b/CHANGES.rst -index f85ec88..a3055aa 100644 +index 7012a45..b227479 100644 --- a/CHANGES.rst +++ b/CHANGES.rst -@@ -15,6 +15,9 @@ New: - - Added events to notifiy before/after all/single transform(s) are executed. - [jensens] +@@ -14,7 +14,8 @@ New features: + Bug fixes: + +-- *add item here* +- Remove unittest2 dependency + [kakshay21] -+ - - 1.1.0 (2016-02-21) - ------------------ -diff --git a/plone/transformchain/tests.py b/plone/transformchain/tests.py -index 9314d66..efe7a3b 100644 ---- a/plone/transformchain/tests.py -+++ b/plone/transformchain/tests.py + + + 3.0.23 (2016-11-26) +diff --git a/plone/protect/tests/testAuto.py b/plone/protect/tests/testAuto.py +index 4454b80..e3394a4 100644 +--- a/plone/protect/tests/testAuto.py ++++ b/plone/protect/tests/testAuto.py @@ -16,7 +16,7 @@ + from zope.component import getUtility + + import transaction +-import unittest2 as unittest ++import unittest + + + class _BaseAutoTest(object): +diff --git a/plone/protect/tests/testPatches.py b/plone/protect/tests/testPatches.py +index 0b01ac2..3a17b56 100644 +--- a/plone/protect/tests/testPatches.py ++++ b/plone/protect/tests/testPatches.py +@@ -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): +diff --git a/plone/protect/tests/testUtils.py b/plone/protect/tests/testUtils.py +index e26381d..92bd1b6 100644 +--- a/plone/protect/tests/testUtils.py ++++ b/plone/protect/tests/testUtils.py +@@ -6,7 +6,7 @@ + from unittest import TestCase + from unittest import TestSuite - import os - import tempfile -import unittest2 as unittest +import unittest - class FauxPubEvent(object): + def funcWithoutRequest():