Skip to content

Commit

Permalink
[fc] Repository: Products.Archetypes
Browse files Browse the repository at this point in the history 
Branch: refs/heads/master
Date: 2016-02-23T15:40:56+01:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: plone/Products.Archetypes@3b031f6

Replace deprecated zope.site.hooks import with zope.component.hooks.

Files changed:
M CHANGES.rst
M Products/Archetypes/fieldproperty.py
M Products/Archetypes/tests/traversal.txt
M setup.py
Repository: Products.Archetypes
Branch: refs/heads/master
Date: 2016-02-24T00:20:52+01:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/Products.Archetypes@4ef388f

Merge pull request #53 from plone/thet-rmzopesitehooks

Replace deprecated zope.site.hooks import with zope.component.hooks.

Files changed:
M CHANGES.rst
M Products/Archetypes/fieldproperty.py
M Products/Archetypes/tests/traversal.txt
M setup.py
  • Loading branch information
@jensens
jensens committed Feb 23, 2016
1 parent 840bf81 commit 9e49e32
Showing 1 changed file with 114 additions and 120 deletions.
234 changes: 114 additions & 120 deletions last_commit.txt
View file
Original file line number Diff line number Diff line change
@@ -1,156 +1,150 @@
Repository: plone.app.robotframework
Repository: Products.Archetypes


Branch: refs/heads/master
Date: 2016-02-23T13:27:24+01:00
Date: 2016-02-23T15:40:56+01:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: https://github.com/plone/plone.app.robotframework/commit/6794b8790eff28ab83dc5a8c0af86e7c74a8a932
Commit: https://github.com/plone/Products.Archetypes/commit/3b031f61cddab34c1da23caed7f7b5d2606578d3

Replace import of zope.testing.testrunner with zope.testrunner.
Replace deprecated zope.site.hooks import with zope.component.hooks.

Files changed:
M CHANGES.txt
M CHANGES.rst
M Products/Archetypes/fieldproperty.py
M Products/Archetypes/tests/traversal.txt
M setup.py
M src/plone/app/robotframework/server.py

diff --git a/CHANGES.txt b/CHANGES.txt
index 7745222..ba785e2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,8 +4,9 @@ Changelog
0.9.15 (unreleased)
-------------------
diff --git a/CHANGES.rst b/CHANGES.rst
index 50414fe..0b7424a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,6 +10,9 @@ New:

-- Nothing changed yet.
-
+- Replace import of ``zope.testing.testrunner`` with ``zope.testrunner``.
+ [thet]
+
Fixes:

0.9.14 (2015-10-11)
-------------------
diff --git a/setup.py b/setup.py
index 69e4537..0bb1daa 100644
--- a/setup.py
+++ b/setup.py
@@ -60,7 +60,7 @@ def indent(line):
'zope.configuration',
'zope.i18n',
'zope.schema',
- 'zope.testing',
+ 'zope.testrunner',
]
+- Replace deprecated ``zope.site.hooks`` import with ``zope.component.hooks``.
+ [thet]
+
- Fix tinymce pattern-options merging to be compatible with change in
p.a.widgets and p.a.z3cform.
[alecm]
diff --git a/Products/Archetypes/fieldproperty.py b/Products/Archetypes/fieldproperty.py
index 575df73..575b2c0 100644
--- a/Products/Archetypes/fieldproperty.py
+++ b/Products/Archetypes/fieldproperty.py
@@ -2,11 +2,9 @@
"""

test_requires = [
diff --git a/src/plone/app/robotframework/server.py b/src/plone/app/robotframework/server.py
index bb089c7..deed6da 100644
--- a/src/plone/app/robotframework/server.py
+++ b/src/plone/app/robotframework/server.py
@@ -272,7 +272,7 @@ def zodb_setup(self, layer_dotted_name=None):
if layer_dotted_name:
self.set_zope_layer(layer_dotted_name)
from DateTime import DateTime
-from datetime import datetime
+from zope.component.hooks import getSite
from zope.datetime import parseDatetimetz

- from zope.testing.testrunner.runner import order_by_bases
+ from zope.testrunner.runner import order_by_bases
layers = order_by_bases([self.zope_layer])
for layer in layers:
if hasattr(layer, 'testSetUp'):
@@ -287,7 +287,7 @@ def zodb_teardown(self, layer_dotted_name=None):
if layer_dotted_name:
self.set_zope_layer(layer_dotted_name)
-from zope.site.hooks import getSite
-

- from zope.testing.testrunner.runner import order_by_bases
+ from zope.testrunner.runner import order_by_bases
layers = order_by_bases([self.zope_layer])
layers.reverse()
for layer in layers:
@@ -327,7 +327,7 @@ def setup_layer(layer, setup_layers=setup_layers):
class ATFieldProperty(object):
"""Field properties based on Archetypes schema
diff --git a/Products/Archetypes/tests/traversal.txt b/Products/Archetypes/tests/traversal.txt
index 71f279e..72016e3 100644
--- a/Products/Archetypes/tests/traversal.txt
+++ b/Products/Archetypes/tests/traversal.txt
@@ -177,7 +177,7 @@ We need to do some site magic, or our we end up with the SimpleView class
being persisted in the local component registry. We really shouldn't do
ZCML registrations in function tests.

- >>> from zope.site.hooks import getSite, setSite
+ >>> from zope.component.hooks import getSite, setSite
>>> site = getSite()

def tear_down(setup_layers=setup_layers):
- from zope.testing.testrunner.runner import order_by_bases
+ from zope.testrunner.runner import order_by_bases
# Tear down any layers not needed for these tests. The unneeded layers
# might interfere.
unneeded = [l for l in setup_layers]
>>> setSite(None)
diff --git a/setup.py b/setup.py
index e83e746..16873e4 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,6 @@
'zope.lifecycleevent',
'zope.publisher',
'zope.schema',
- 'zope.site',
'zope.tal',
'zope.viewlet',
'Products.CMFCore',


Repository: plone.app.robotframework
Repository: Products.Archetypes


Branch: refs/heads/master
Date: 2016-02-23T22:33:44+01:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: https://github.com/plone/plone.app.robotframework/commit/8093be23aae7089c96187b7e756f1d23d6e9af73
Date: 2016-02-24T00:20:52+01:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: https://github.com/plone/Products.Archetypes/commit/4ef388fbd499f874f7a11af29aa758282861ac84

Merge pull request #52 from plone/thet-zope4
Merge pull request #53 from plone/thet-rmzopesitehooks

Zope 4 compatibility
Replace deprecated zope.site.hooks import with zope.component.hooks.

Files changed:
M CHANGES.txt
M CHANGES.rst
M Products/Archetypes/fieldproperty.py
M Products/Archetypes/tests/traversal.txt
M setup.py
M src/plone/app/robotframework/server.py

diff --git a/CHANGES.txt b/CHANGES.txt
index 7745222..ba785e2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,8 +4,9 @@ Changelog
0.9.15 (unreleased)
-------------------
diff --git a/CHANGES.rst b/CHANGES.rst
index 50414fe..0b7424a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,6 +10,9 @@ New:

-- Nothing changed yet.
-
+- Replace import of ``zope.testing.testrunner`` with ``zope.testrunner``.
+ [thet]
+
Fixes:

0.9.14 (2015-10-11)
-------------------
diff --git a/setup.py b/setup.py
index 69e4537..0bb1daa 100644
--- a/setup.py
+++ b/setup.py
@@ -60,7 +60,7 @@ def indent(line):
'zope.configuration',
'zope.i18n',
'zope.schema',
- 'zope.testing',
+ 'zope.testrunner',
]
+- Replace deprecated ``zope.site.hooks`` import with ``zope.component.hooks``.
+ [thet]
+
- Fix tinymce pattern-options merging to be compatible with change in
p.a.widgets and p.a.z3cform.
[alecm]
diff --git a/Products/Archetypes/fieldproperty.py b/Products/Archetypes/fieldproperty.py
index 575df73..575b2c0 100644
--- a/Products/Archetypes/fieldproperty.py
+++ b/Products/Archetypes/fieldproperty.py
@@ -2,11 +2,9 @@
"""

test_requires = [
diff --git a/src/plone/app/robotframework/server.py b/src/plone/app/robotframework/server.py
index bb089c7..deed6da 100644
--- a/src/plone/app/robotframework/server.py
+++ b/src/plone/app/robotframework/server.py
@@ -272,7 +272,7 @@ def zodb_setup(self, layer_dotted_name=None):
if layer_dotted_name:
self.set_zope_layer(layer_dotted_name)
from DateTime import DateTime
-from datetime import datetime
+from zope.component.hooks import getSite
from zope.datetime import parseDatetimetz

- from zope.testing.testrunner.runner import order_by_bases
+ from zope.testrunner.runner import order_by_bases
layers = order_by_bases([self.zope_layer])
for layer in layers:
if hasattr(layer, 'testSetUp'):
@@ -287,7 +287,7 @@ def zodb_teardown(self, layer_dotted_name=None):
if layer_dotted_name:
self.set_zope_layer(layer_dotted_name)
-from zope.site.hooks import getSite
-

- from zope.testing.testrunner.runner import order_by_bases
+ from zope.testrunner.runner import order_by_bases
layers = order_by_bases([self.zope_layer])
layers.reverse()
for layer in layers:
@@ -327,7 +327,7 @@ def setup_layer(layer, setup_layers=setup_layers):
class ATFieldProperty(object):
"""Field properties based on Archetypes schema
diff --git a/Products/Archetypes/tests/traversal.txt b/Products/Archetypes/tests/traversal.txt
index 71f279e..72016e3 100644
--- a/Products/Archetypes/tests/traversal.txt
+++ b/Products/Archetypes/tests/traversal.txt
@@ -177,7 +177,7 @@ We need to do some site magic, or our we end up with the SimpleView class
being persisted in the local component registry. We really shouldn't do
ZCML registrations in function tests.

- >>> from zope.site.hooks import getSite, setSite
+ >>> from zope.component.hooks import getSite, setSite
>>> site = getSite()

def tear_down(setup_layers=setup_layers):
- from zope.testing.testrunner.runner import order_by_bases
+ from zope.testrunner.runner import order_by_bases
# Tear down any layers not needed for these tests. The unneeded layers
# might interfere.
unneeded = [l for l in setup_layers]
>>> setSite(None)
diff --git a/setup.py b/setup.py
index e83e746..16873e4 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,6 @@
'zope.lifecycleevent',
'zope.publisher',
'zope.schema',
- 'zope.site',
'zope.tal',
'zope.viewlet',
'Products.CMFCore',


0 comments on commit 9e49e32

Please sign in to comment.