Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
Zope
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
Zope
Commits
ca50d547
Commit
ca50d547
authored
Apr 02, 2012
by
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- updated imports
parent
1da436a4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
src/Products/Five/component/__init__.py
src/Products/Five/component/__init__.py
+1
-1
src/Products/Five/component/browser.py
src/Products/Five/component/browser.py
+1
-1
src/Products/Five/component/makesite.txt
src/Products/Five/component/makesite.txt
+1
-1
src/Testing/ZopeTestCase/functional.py
src/Testing/ZopeTestCase/functional.py
+2
-2
No files found.
src/Products/Five/component/__init__.py
View file @
ca50d547
...
@@ -28,7 +28,7 @@ from ZPublisher.BeforeTraverse import registerBeforeTraverse
...
@@ -28,7 +28,7 @@ from ZPublisher.BeforeTraverse import registerBeforeTraverse
from
ZPublisher.BeforeTraverse
import
unregisterBeforeTraverse
from
ZPublisher.BeforeTraverse
import
unregisterBeforeTraverse
# Hook up custom component architecture calls
# Hook up custom component architecture calls
from
zope.
site
.hooks
import
setHooks
from
zope.
component
.hooks
import
setHooks
setHooks
()
setHooks
()
def
findSite
(
obj
,
iface
=
ISite
):
def
findSite
(
obj
,
iface
=
ISite
):
...
...
src/Products/Five/component/browser.py
View file @
ca50d547
...
@@ -19,8 +19,8 @@ from Products.Five.component import enableSite, disableSite
...
@@ -19,8 +19,8 @@ from Products.Five.component import enableSite, disableSite
from
Products.Five.component.interfaces
import
IObjectManagerSite
from
Products.Five.component.interfaces
import
IObjectManagerSite
from
zope.component.globalregistry
import
base
from
zope.component.globalregistry
import
base
from
zope.component.hooks
import
setSite
from
zope.component.persistentregistry
import
PersistentComponents
from
zope.component.persistentregistry
import
PersistentComponents
from
zope.site.hooks
import
setSite
class
ObjectManagerSiteView
(
BrowserView
):
class
ObjectManagerSiteView
(
BrowserView
):
...
...
src/Products/Five/component/makesite.txt
View file @
ca50d547
...
@@ -18,7 +18,7 @@ Load all of Five's configuration (this is a functional test):
...
@@ -18,7 +18,7 @@ Load all of Five's configuration (this is a functional test):
Enable local component lookup hooks:
Enable local component lookup hooks:
>>> from zope.
site
.hooks import setHooks
>>> from zope.
component
.hooks import setHooks
>>> setHooks()
>>> setHooks()
...
...
src/Testing/ZopeTestCase/functional.py
View file @
ca50d547
...
@@ -29,8 +29,8 @@ def savestate(func):
...
@@ -29,8 +29,8 @@ def savestate(func):
'''
'''
from
AccessControl.SecurityManagement
import
getSecurityManager
from
AccessControl.SecurityManagement
import
getSecurityManager
from
AccessControl.SecurityManagement
import
setSecurityManager
from
AccessControl.SecurityManagement
import
setSecurityManager
from
zope.
site
.hooks
import
getSite
from
zope.
component
.hooks
import
getSite
from
zope.
site
.hooks
import
setSite
from
zope.
component
.hooks
import
setSite
def
wrapped_func
(
*
args
,
**
kw
):
def
wrapped_func
(
*
args
,
**
kw
):
sm
,
site
=
getSecurityManager
(),
getSite
()
sm
,
site
=
getSecurityManager
(),
getSite
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment