-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fc] Repository: plone.app.querystring
Branch: refs/heads/master Date: 2017-06-01T02:10:32+05:30 Author: kakshay21 (kakshay21) <k.akshay9721@gmail.com> Commit: plone/plone.app.querystring@6d68847 remove unittest2 dependency Files changed: M CHANGES.rst M plone/app/querystring/tests/testIndexmodifiers.py M plone/app/querystring/tests/testQueryBuilder.py M plone/app/querystring/tests/testQueryBuilderModifiers.py M plone/app/querystring/tests/testQueryParser.py M plone/app/querystring/tests/testRegistryIntegration.py M plone/app/querystring/tests/testRegistryReader.py Repository: plone.app.querystring Branch: refs/heads/master Date: 2017-06-01T00:03:52+02:00 Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com> Commit: plone/plone.app.querystring@40e5c92 Merge pull request #78 from plone/kakshay21-unittest remove unittest2 dependency Files changed: M CHANGES.rst M plone/app/querystring/tests/testIndexmodifiers.py M plone/app/querystring/tests/testQueryBuilder.py M plone/app/querystring/tests/testQueryBuilderModifiers.py M plone/app/querystring/tests/testQueryParser.py M plone/app/querystring/tests/testRegistryIntegration.py M plone/app/querystring/tests/testRegistryReader.py
- Loading branch information
Showing
1 changed file
with
210 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,32 +1,228 @@ | ||
Repository: plone.namedfile | ||
Repository: plone.app.querystring | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2017-05-30T21:07:27+02:00 | ||
Date: 2017-06-01T02:10:32+05:30 | ||
Author: kakshay21 (kakshay21) <k.akshay9721@gmail.com> | ||
Commit: https://github.com/plone/plone.app.querystring/commit/6d68847a344c3d8b6540c183bd82d3ef7c8e0396 | ||
|
||
remove unittest2 dependency | ||
|
||
Files changed: | ||
M CHANGES.rst | ||
M plone/app/querystring/tests/testIndexmodifiers.py | ||
M plone/app/querystring/tests/testQueryBuilder.py | ||
M plone/app/querystring/tests/testQueryBuilderModifiers.py | ||
M plone/app/querystring/tests/testQueryParser.py | ||
M plone/app/querystring/tests/testRegistryIntegration.py | ||
M plone/app/querystring/tests/testRegistryReader.py | ||
|
||
diff --git a/CHANGES.rst b/CHANGES.rst | ||
index 9a3ace8..cb2d407 100644 | ||
--- a/CHANGES.rst | ||
+++ b/CHANGES.rst | ||
@@ -14,7 +14,8 @@ New features: | ||
|
||
Bug fixes: | ||
|
||
-- *add item here* | ||
+- remove unittest2 dependency | ||
+ [kakshay21] | ||
|
||
|
||
1.4.4 (2017-05-23) | ||
diff --git a/plone/app/querystring/tests/testIndexmodifiers.py b/plone/app/querystring/tests/testIndexmodifiers.py | ||
index dfec1a0..27841b1 100644 | ||
--- a/plone/app/querystring/tests/testIndexmodifiers.py | ||
+++ b/plone/app/querystring/tests/testIndexmodifiers.py | ||
@@ -3,7 +3,7 @@ | ||
from datetime import datetime | ||
from plone.app.querystring.indexmodifiers import query_index_modifiers | ||
|
||
-import unittest2 as unittest | ||
+import unittest | ||
|
||
|
||
class TestIndexModifiers(unittest.TestCase): | ||
diff --git a/plone/app/querystring/tests/testQueryBuilder.py b/plone/app/querystring/tests/testQueryBuilder.py | ||
index dd97420..419a531 100644 | ||
--- a/plone/app/querystring/tests/testQueryBuilder.py | ||
+++ b/plone/app/querystring/tests/testQueryBuilder.py | ||
@@ -6,7 +6,7 @@ | ||
from zope.component import getMultiAdapter | ||
from zope.publisher.browser import TestRequest | ||
|
||
-import unittest2 as unittest | ||
+import unittest | ||
|
||
|
||
class TestQuerybuilder(unittest.TestCase): | ||
diff --git a/plone/app/querystring/tests/testQueryBuilderModifiers.py b/plone/app/querystring/tests/testQueryBuilderModifiers.py | ||
index 3ea05f1..9b68aea 100644 | ||
--- a/plone/app/querystring/tests/testQueryBuilderModifiers.py | ||
+++ b/plone/app/querystring/tests/testQueryBuilderModifiers.py | ||
@@ -10,7 +10,7 @@ | ||
|
||
import index_testmodifier | ||
|
||
-import unittest2 as unittest | ||
+import unittest | ||
|
||
|
||
class TestQuerybuilderExtended(unittest.TestCase): | ||
diff --git a/plone/app/querystring/tests/testQueryParser.py b/plone/app/querystring/tests/testQueryParser.py | ||
index 5dd5be6..f728cf3 100644 | ||
--- a/plone/app/querystring/tests/testQueryParser.py | ||
+++ b/plone/app/querystring/tests/testQueryParser.py | ||
@@ -15,7 +15,7 @@ | ||
from zope.component import getGlobalSiteManager | ||
from zope.interface import implementer | ||
|
||
-import unittest2 as unittest | ||
+import unittest | ||
|
||
MOCK_SITE_ID = "site" | ||
|
||
diff --git a/plone/app/querystring/tests/testRegistryIntegration.py b/plone/app/querystring/tests/testRegistryIntegration.py | ||
index 2d12c73..05e5cfb 100644 | ||
--- a/plone/app/querystring/tests/testRegistryIntegration.py | ||
+++ b/plone/app/querystring/tests/testRegistryIntegration.py | ||
@@ -2,7 +2,7 @@ | ||
from plone.app.querystring.testing import \ | ||
PLONEAPPQUERYSTRING_INTEGRATION_TESTING | ||
|
||
-import unittest2 as unittest | ||
+import unittest | ||
|
||
|
||
class TestOperationDefinitions(unittest.TestCase): | ||
diff --git a/plone/app/querystring/tests/testRegistryReader.py b/plone/app/querystring/tests/testRegistryReader.py | ||
index 0159698..1966a1a 100644 | ||
--- a/plone/app/querystring/tests/testRegistryReader.py | ||
+++ b/plone/app/querystring/tests/testRegistryReader.py | ||
@@ -12,7 +12,7 @@ | ||
PLONEAPPQUERYSTRING_INTEGRATION_TESTING | ||
from plone.app.querystring.tests import registry_testdata as td | ||
|
||
-import unittest2 as unittest | ||
+import unittest | ||
|
||
|
||
@implementer(IVocabularyFactory) | ||
|
||
|
||
Repository: plone.app.querystring | ||
|
||
|
||
Branch: refs/heads/master | ||
Date: 2017-06-01T00:03:52+02:00 | ||
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com> | ||
Commit: https://github.com/plone/plone.namedfile/commit/84ef253e27d09abd81381e2baa221e739a9da8e5 | ||
Commit: https://github.com/plone/plone.app.querystring/commit/40e5c92fdf02667aa378464564fc067cf07fd290 | ||
|
||
Update CHANGES.rst | ||
Merge pull request #78 from plone/kakshay21-unittest | ||
|
||
Somehow I managed to put *that* as the next version :-/ | ||
remove unittest2 dependency | ||
|
||
Files changed: | ||
M CHANGES.rst | ||
M plone/app/querystring/tests/testIndexmodifiers.py | ||
M plone/app/querystring/tests/testQueryBuilder.py | ||
M plone/app/querystring/tests/testQueryBuilderModifiers.py | ||
M plone/app/querystring/tests/testQueryParser.py | ||
M plone/app/querystring/tests/testRegistryIntegration.py | ||
M plone/app/querystring/tests/testRegistryReader.py | ||
|
||
diff --git a/CHANGES.rst b/CHANGES.rst | ||
index dafe68e..712b8ab 100644 | ||
index 9a3ace8..cb2d407 100644 | ||
--- a/CHANGES.rst | ||
+++ b/CHANGES.rst | ||
@@ -1,8 +1,8 @@ | ||
Changelog | ||
========= | ||
@@ -14,7 +14,8 @@ New features: | ||
|
||
Bug fixes: | ||
|
||
-- *add item here* | ||
+- remove unittest2 dependency | ||
+ [kakshay21] | ||
|
||
|
||
1.4.4 (2017-05-23) | ||
diff --git a/plone/app/querystring/tests/testIndexmodifiers.py b/plone/app/querystring/tests/testIndexmodifiers.py | ||
index dfec1a0..27841b1 100644 | ||
--- a/plone/app/querystring/tests/testIndexmodifiers.py | ||
+++ b/plone/app/querystring/tests/testIndexmodifiers.py | ||
@@ -3,7 +3,7 @@ | ||
from datetime import datetime | ||
from plone.app.querystring.indexmodifiers import query_index_modifiers | ||
|
||
-import unittest2 as unittest | ||
+import unittest | ||
|
||
|
||
class TestIndexModifiers(unittest.TestCase): | ||
diff --git a/plone/app/querystring/tests/testQueryBuilder.py b/plone/app/querystring/tests/testQueryBuilder.py | ||
index dd97420..419a531 100644 | ||
--- a/plone/app/querystring/tests/testQueryBuilder.py | ||
+++ b/plone/app/querystring/tests/testQueryBuilder.py | ||
@@ -6,7 +6,7 @@ | ||
from zope.component import getMultiAdapter | ||
from zope.publisher.browser import TestRequest | ||
|
||
-import unittest2 as unittest | ||
+import unittest | ||
|
||
|
||
class TestQuerybuilder(unittest.TestCase): | ||
diff --git a/plone/app/querystring/tests/testQueryBuilderModifiers.py b/plone/app/querystring/tests/testQueryBuilderModifiers.py | ||
index 3ea05f1..9b68aea 100644 | ||
--- a/plone/app/querystring/tests/testQueryBuilderModifiers.py | ||
+++ b/plone/app/querystring/tests/testQueryBuilderModifiers.py | ||
@@ -10,7 +10,7 @@ | ||
|
||
import index_testmodifier | ||
|
||
-import unittest2 as unittest | ||
+import unittest | ||
|
||
|
||
class TestQuerybuilderExtended(unittest.TestCase): | ||
diff --git a/plone/app/querystring/tests/testQueryParser.py b/plone/app/querystring/tests/testQueryParser.py | ||
index 5dd5be6..f728cf3 100644 | ||
--- a/plone/app/querystring/tests/testQueryParser.py | ||
+++ b/plone/app/querystring/tests/testQueryParser.py | ||
@@ -15,7 +15,7 @@ | ||
from zope.component import getGlobalSiteManager | ||
from zope.interface import implementer | ||
|
||
-import unittest2 as unittest | ||
+import unittest | ||
|
||
MOCK_SITE_ID = "site" | ||
|
||
diff --git a/plone/app/querystring/tests/testRegistryIntegration.py b/plone/app/querystring/tests/testRegistryIntegration.py | ||
index 2d12c73..05e5cfb 100644 | ||
--- a/plone/app/querystring/tests/testRegistryIntegration.py | ||
+++ b/plone/app/querystring/tests/testRegistryIntegration.py | ||
@@ -2,7 +2,7 @@ | ||
from plone.app.querystring.testing import \ | ||
PLONEAPPQUERYSTRING_INTEGRATION_TESTING | ||
|
||
-import unittest2 as unittest | ||
+import unittest | ||
|
||
|
||
class TestOperationDefinitions(unittest.TestCase): | ||
diff --git a/plone/app/querystring/tests/testRegistryReader.py b/plone/app/querystring/tests/testRegistryReader.py | ||
index 0159698..1966a1a 100644 | ||
--- a/plone/app/querystring/tests/testRegistryReader.py | ||
+++ b/plone/app/querystring/tests/testRegistryReader.py | ||
@@ -12,7 +12,7 @@ | ||
PLONEAPPQUERYSTRING_INTEGRATION_TESTING | ||
from plone.app.querystring.tests import registry_testdata as td | ||
|
||
-[B (unreleased) | ||
----------------- | ||
+4.2.2.dev0 (unreleased) | ||
+----------------------- | ||
-import unittest2 as unittest | ||
+import unittest | ||
|
||
Breaking changes: | ||
|
||
@implementer(IVocabularyFactory) | ||
|
||
|