[Checkins] SVN: Sandbox/ulif/grokadmin/trunk/src/grokadmin/ Updated
old references to grok.admin.
Uli Fouquet
uli at gnufix.de
Mon Oct 8 16:33:29 EDT 2007
Log message for revision 80718:
Updated old references to grok.admin.
Changed:
A Sandbox/ulif/grokadmin/trunk/src/grokadmin/configure.zcml
U Sandbox/ulif/grokadmin/trunk/src/grokadmin/docgrok.py
U Sandbox/ulif/grokadmin/trunk/src/grokadmin/docgrok.txt
U Sandbox/ulif/grokadmin/trunk/src/grokadmin/objectinfo.py
U Sandbox/ulif/grokadmin/trunk/src/grokadmin/objectinfo.txt
U Sandbox/ulif/grokadmin/trunk/src/grokadmin/tests/test_grokadmin.py
U Sandbox/ulif/grokadmin/trunk/src/grokadmin/utilities.py
U Sandbox/ulif/grokadmin/trunk/src/grokadmin/view.py
-=-
Added: Sandbox/ulif/grokadmin/trunk/src/grokadmin/configure.zcml
===================================================================
--- Sandbox/ulif/grokadmin/trunk/src/grokadmin/configure.zcml (rev 0)
+++ Sandbox/ulif/grokadmin/trunk/src/grokadmin/configure.zcml 2007-10-08 20:33:28 UTC (rev 80718)
@@ -0,0 +1,5 @@
+<configure xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="grok" />
+ <grok:grok package="." />
+</configure>
Modified: Sandbox/ulif/grokadmin/trunk/src/grokadmin/docgrok.py
===================================================================
--- Sandbox/ulif/grokadmin/trunk/src/grokadmin/docgrok.py 2007-10-08 15:09:56 UTC (rev 80717)
+++ Sandbox/ulif/grokadmin/trunk/src/grokadmin/docgrok.py 2007-10-08 20:33:28 UTC (rev 80718)
@@ -47,7 +47,7 @@
from grok.interfaces import IApplication
from martian.scan import is_package, ModuleInfo
from martian import ClassGrokker, ModuleGrokker
-from grok.admin.objectinfo import ZopeObjectInfo
+from grokadmin.objectinfo import ZopeObjectInfo
# This is the name under which the docgrok object-browser can be
# reached.
@@ -269,7 +269,7 @@
docgrok module, because it contains a more specific grokker: the
InstanceGrokker 'docgrok_grokker' ::
- >>> from grok.admin import docgrok
+ >>> from grokadmin import docgrok
Then we create an (empty) 'ModuleGrokker'. 'ModuleGrokkers' can
grok whole modules. ::
@@ -284,7 +284,7 @@
The 'docgrok_handler_grokker' is an instance of 'DocGrokGrokker'::
- >>> from grok.admin.docgrok import DocGrokGrokker
+ >>> from grokadmin.docgrok import DocGrokGrokker
>>> isinstance(docgrok.docgrok_handler_grokker, DocGrokGrokker)
True
Modified: Sandbox/ulif/grokadmin/trunk/src/grokadmin/docgrok.txt
===================================================================
--- Sandbox/ulif/grokadmin/trunk/src/grokadmin/docgrok.txt 2007-10-08 15:09:56 UTC (rev 80717)
+++ Sandbox/ulif/grokadmin/trunk/src/grokadmin/docgrok.txt 2007-10-08 20:33:28 UTC (rev 80718)
@@ -53,16 +53,16 @@
The doctor can also be reached via Python, naturally:
>>> import grok
- >>> from grok.admin import docgrok
- >>> doctor = docgrok.DocGrok('grok.admin.docgrok')
+ >>> from grokadmin import docgrok
+ >>> doctor = docgrok.DocGrok('grokadmin.docgrok')
This doctor has immediatly a patient, which is denoted by the dotted
-path `grok.admin.docgrok`. The dotted path might reference any thing
+path `grokadmin.docgrok`. The dotted path might reference any thing
which lives in the Python environment: a package, a module, a class, a
function or even a file or some interface attribute:
>>> doctor.getPath()
- 'grok.admin.docgrok'
+ 'grokadmin.docgrok'
We can also get a filepath, using the `getFilePath()` method. Objects,
which have no filepath always return `None`.
@@ -76,10 +76,10 @@
specialist. For example a package doctor, who happens to be called
`DocGrokPackage` :
- >>> from grok.admin.docgrok import DocGrokPackage
+ >>> from grokadmin.docgrok import DocGrokPackage
>>> doctor = DocGrokPackage('grok')
>>> doctor
- <grok.admin.docgrok.DocGrokPackage ...>
+ <grokadmin.docgrok.DocGrokPackage ...>
Using ``getPath()`` we get the dotted path of the thing, the doctor
cares for:
@@ -127,10 +127,10 @@
the function ``docgrok_handle()`` which delivers us a doctor, who
can tell us more:
- >>> from grok.admin.docgrok import docgrok_handle
- >>> thedoc = docgrok_handle('grok.admin.docgrok')
+ >>> from grokadmin.docgrok import docgrok_handle
+ >>> thedoc = docgrok_handle('grokadmin.docgrok')
>>> thedoc
- <grok.admin.docgrok.DocGrokModule ...>
+ <grokadmin.docgrok.DocGrokModule ...>
This is correct. `docgrok` of course *is* a python module, so the best
specialist we can get is a `DocGrokModule`. The mentioned function
@@ -139,12 +139,12 @@
We can, for example ask for a different doc like this:
- >>> thedoc = docgrok_handle('grok.admin.docgrok.DocGrok')
+ >>> thedoc = docgrok_handle('grokadmin.docgrok.DocGrok')
>>> thedoc
- <grok.admin.docgrok.DocGrokClass ...>
+ <grokadmin.docgrok.DocGrokClass ...>
and get a class-specific doctor. Because
-``grok.admin.docgrok.DocGrok`` *is* a class, this is again the most
+``grokadmin.docgrok.DocGrok`` *is* a class, this is again the most
appropriate doc we could get.
@@ -171,7 +171,7 @@
``grok.View`` is a class, we choose the DocGrokClass as base for our
new DocGrok:
- >>> from grok.admin.docgrok import DocGrokClass
+ >>> from grokadmin.docgrok import DocGrokClass
>>> class DocGrokGrokView(DocGrokClass):
... """"This doctor cares for grok.Views."""
Modified: Sandbox/ulif/grokadmin/trunk/src/grokadmin/objectinfo.py
===================================================================
--- Sandbox/ulif/grokadmin/trunk/src/grokadmin/objectinfo.py 2007-10-08 15:09:56 UTC (rev 80717)
+++ Sandbox/ulif/grokadmin/trunk/src/grokadmin/objectinfo.py 2007-10-08 20:33:28 UTC (rev 80718)
@@ -23,7 +23,7 @@
from types import MethodType
import grok
-from grok.admin.utilities import isContainingEvilRegExpChars
+from grokadmin.utilities import isContainingEvilRegExpChars
import zope
from zope.interface import Interface, implementedBy
Modified: Sandbox/ulif/grokadmin/trunk/src/grokadmin/objectinfo.txt
===================================================================
--- Sandbox/ulif/grokadmin/trunk/src/grokadmin/objectinfo.txt 2007-10-08 15:09:56 UTC (rev 80717)
+++ Sandbox/ulif/grokadmin/trunk/src/grokadmin/objectinfo.txt 2007-10-08 20:33:28 UTC (rev 80718)
@@ -33,10 +33,10 @@
Manfred. We create an ObjectInfo by giving the object to examine as
parameter:
- >>> from grok.admin.objectinfo import ObjectInfo
+ >>> from grokadmin.objectinfo import ObjectInfo
>>> info = ObjectInfo(manfred)
>>> info
- <grok.admin.objectinfo.ObjectInfo object at ...>
+ <grokadmin.objectinfo.ObjectInfo object at ...>
What can we know about Manfred now?
@@ -50,15 +50,15 @@
A Mammoth is not a module. Let's see, what happens when we examine a
real module:
- >>> import grok.admin.objectinfo
- >>> ObjectInfo(grok.admin).getmoduleinfo() in [('__init__', '.pyc',
+ >>> import grokadmin.objectinfo
+ >>> ObjectInfo(grokadmin).getmoduleinfo() in [('__init__', '.pyc',
... 'rb', 2), ('__init__', '.py', 'U', 1)]
True
>>> info.getmodulename() is None
True
- >>> ObjectInfo(grok.admin.objectinfo).getmodulename()
+ >>> ObjectInfo(grokadmin.objectinfo).getmodulename()
'objectinfo'
>>> info.isclass()
@@ -117,7 +117,7 @@
We have a comment in the sources of ObjectInfo:
- >>> ObjectInfo(grok.admin.objectinfo.ObjectInfo.getdoc).getcomments()
+ >>> ObjectInfo(grokadmin.objectinfo.ObjectInfo.getdoc).getcomments()
'# Source code related...\n'
A bug in ``inspect.getcomments()`` causes objects with regular
@@ -139,10 +139,10 @@
The filename can be a compiled file ('.pyc') or a Python source file
('.py'):
- >>> filename = ObjectInfo(grok.admin.objectinfo.ObjectInfo).getfile()
+ >>> filename = ObjectInfo(grokadmin.objectinfo.ObjectInfo).getfile()
>>> filename = filename[-1] == 'c' and filename or filename + 'c'
>>> pnorm(filename)
- '.../grok/admin/objectinfo.pyc'
+ '.../grokadmin/objectinfo.pyc'
>>> info.getmodule()
@@ -154,13 +154,13 @@
>>> info.getsourcefile() is None
True
- >>> pnorm(ObjectInfo(grok.admin.objectinfo.ObjectInfo).getsourcefile())
- '.../grok/admin/objectinfo.py'
+ >>> pnorm(ObjectInfo(grokadmin.objectinfo.ObjectInfo).getsourcefile())
+ '.../grokadmin/objectinfo.py'
>>> info.getsourcelines() is None
True
- >>> ObjectInfo(grok.admin.objectinfo.ObjectInfo.isclass).getsourcelines()
+ >>> ObjectInfo(grokadmin.objectinfo.ObjectInfo.isclass).getsourcelines()
([' def isclass(self):\n',...)
>>> ObjectInfo(len).getsourcefile() is None
@@ -169,7 +169,7 @@
>>> info.getsource() is None
True
- >>> ObjectInfo(grok.admin.objectinfo.ObjectInfo.isclass).getsource()
+ >>> ObjectInfo(grokadmin.objectinfo.ObjectInfo.isclass).getsource()
' def isclass(self):\n...'
A bug in ``inspect.getsource()`` causes objects with regular
@@ -205,10 +205,10 @@
Then get an associated ZopeObjectInfo:
- >>> from grok.admin.objectinfo import ZopeObjectInfo
+ >>> from grokadmin.objectinfo import ZopeObjectInfo
>>> root_info = ZopeObjectInfo(root)
>>> root_info
- <grok.admin.objectinfo.ZopeObjectInfo object at ...>
+ <grokadmin.objectinfo.ZopeObjectInfo object at ...>
We create a folder in the root:
@@ -220,28 +220,28 @@
>>> subfolder_info = ZopeObjectInfo(subfolder)
>>> subfolder_info
- <grok.admin.objectinfo.ZopeObjectInfo object at ...>
+ <grokadmin.objectinfo.ZopeObjectInfo object at ...>
Finally, we create some content in the subfolder. A cave, where
Manfred can stay
+ >>> import grok
>>> class Cave(grok.Container):
... """A home, sweet home."""
... pass
- >>> import grok
>>> sweethome = Cave()
>>> subfolder['SweetHome'] = sweethome
>>> sweethome_info = ZopeObjectInfo(sweethome)
>>> sweethome_info
- <grok.admin.objectinfo.ZopeObjectInfo object at ...>
+ <grokadmin.objectinfo.ZopeObjectInfo object at ...>
and put Manfred into the cave:
>>> sweethome['Owner'] = manfred
>>> manfred_info = ZopeObjectInfo(manfred)
>>> manfred_info
- <grok.admin.objectinfo.ZopeObjectInfo object at ...>
+ <grokadmin.objectinfo.ZopeObjectInfo object at ...>
Now we can examine the objects further.
Modified: Sandbox/ulif/grokadmin/trunk/src/grokadmin/tests/test_grokadmin.py
===================================================================
--- Sandbox/ulif/grokadmin/trunk/src/grokadmin/tests/test_grokadmin.py 2007-10-08 15:09:56 UTC (rev 80717)
+++ Sandbox/ulif/grokadmin/trunk/src/grokadmin/tests/test_grokadmin.py 2007-10-08 20:33:28 UTC (rev 80718)
@@ -38,7 +38,7 @@
if filename == '__init__.py':
continue
- dottedname = 'grok.admin.tests.%s.%s' % (name, filename[:-3])
+ dottedname = 'grokadmin.tests.%s.%s' % (name, filename[:-3])
test = doctest.DocTestSuite(dottedname,
setUp=setUpZope,
tearDown=cleanUpZope,
@@ -62,7 +62,7 @@
suite.addTest(suiteFromPackage(name))
for name in ['docgrok.txt', 'docgrok.py', 'objectinfo.txt', 'utilities.py']:
suite.addTest(doctest.DocFileSuite(name,
- package='grok.admin',
+ package='grokadmin',
globs=globs,
setUp=setUpZope,
tearDown=cleanUpZope,
Modified: Sandbox/ulif/grokadmin/trunk/src/grokadmin/utilities.py
===================================================================
--- Sandbox/ulif/grokadmin/trunk/src/grokadmin/utilities.py 2007-10-08 15:09:56 UTC (rev 80717)
+++ Sandbox/ulif/grokadmin/trunk/src/grokadmin/utilities.py 2007-10-08 20:33:28 UTC (rev 80718)
@@ -32,26 +32,27 @@
We can use ObjectInfo objects to check this:
- >>> from grok.admin.objectinfo import ObjectInfo
+ >>> import grok
+ >>> from grokadmin.objectinfo import ObjectInfo
>>> obj = ObjectInfo(None)
>>> obj
- <grok.admin.objectinfo.ObjectInfo object at ...>
+ <grokadmin.objectinfo.ObjectInfo object at ...>
Obviously we have a string representation of the required form
here. So we can get HTML with links to the documentation for
- ``grok``, ``grok.admin`` and so on.
+ ``grokadmin``, ``grokadmin.objectinfo`` and so on.
- >>> from grok.admin.utilities import getPathLinksForObject
+ >>> from grokadmin.utilities import getPathLinksForObject
>>> link = getPathLinksForObject(obj)
>>> link
- "<<a href='/docgrok/grok/'>grok</a>... object at ..."
+ "<<a href='/docgrok/grokadmin/'>grokadmin</a>... object at ..."
We got a link to the ``grok`` documentation. Also links to
- ``grok.admin``, ``grok.admin.objectinfo`` and
- ``grok.admin.objectinfo.ObjectInfo`` are provided:
+ ``grokadmin``, ``grokadmin.objectinfo`` and
+ ``grokadmin.objectinfo.ObjectInfo`` are provided:
>>> link
- "<...<a href='/docgrok/grok/admin/'>admin</a>... object at ..."
+ "<...<a href='/docgrok/grokadmin/objectinfo'>objectinfo</a>... object at ..."
If we provide a root_url, we will find it in the links:
@@ -115,11 +116,11 @@
We can use class ObjectInfo to check this:
- >>> from grok.admin.objectinfo import ObjectInfo
+ >>> from grokadmin.objectinfo import ObjectInfo
>>> ObjectInfo
- <class 'grok.admin.objectinfo.ObjectInfo'>
+ <class 'grokadmin.objectinfo.ObjectInfo'>
- >>> from grok.admin.utilities import getPathLinksForClass
+ >>> from grokadmin.utilities import getPathLinksForClass
>>> htmlcode = getPathLinksForClass(ObjectInfo)
>>> htmlcode
"<class '<a href='/docgrok/grok/'>grok</a>...'>"
@@ -206,7 +207,7 @@
We indeed must provide a string:
- >>> from grok.admin.utilities import isContainingEvilRegExpChars
+ >>> from grokadmin.utilities import isContainingEvilRegExpChars
>>> isContainingEvilRegExpChars(None)
Traceback (most recent call last):
...
@@ -231,7 +232,7 @@
def getParentURL(url):
"""Compute the parent URL for an object described by URL.
- >>> from grok.admin.utilities import getParentURL
+ >>> from grokadmin.utilities import getParentURL
>>> getParentURL('http://foo:8080/myobj')
'http://foo:8080/'
Modified: Sandbox/ulif/grokadmin/trunk/src/grokadmin/view.py
===================================================================
--- Sandbox/ulif/grokadmin/trunk/src/grokadmin/view.py 2007-10-08 15:09:56 UTC (rev 80717)
+++ Sandbox/ulif/grokadmin/trunk/src/grokadmin/view.py 2007-10-08 20:33:28 UTC (rev 80718)
@@ -18,14 +18,14 @@
import inspect
from urllib import urlencode
-from grok.admin import docgrok
-from grok.admin.docgrok import DocGrok, DocGrokPackage, DocGrokModule
-from grok.admin.docgrok import DocGrokTextFile, DocGrokGrokApplication
-from grok.admin.docgrok import DocGrokClass, DocGrokInterface, getItemLink
+from grokadmin import docgrok
+from grokadmin.docgrok import DocGrok, DocGrokPackage, DocGrokModule
+from grokadmin.docgrok import DocGrokTextFile, DocGrokGrokApplication
+from grokadmin.docgrok import DocGrokClass, DocGrokInterface, getItemLink
-from grok.admin.objectinfo import ZopeObjectInfo
-from grok.admin.utilities import getPathLinksForObject, getPathLinksForClass
-from grok.admin.utilities import getPathLinksForDottedName, getParentURL
+from grokadmin.objectinfo import ZopeObjectInfo
+from grokadmin.utilities import getPathLinksForObject, getPathLinksForClass
+from grokadmin.utilities import getPathLinksForDottedName, getParentURL
from ZODB.broken import Broken
from BTrees.OOBTree import OOBTree
@@ -435,7 +435,7 @@
grok.require('grok.ManageApplications')
def getPrincipals(self):
- from grok.admin import AUTH_FOLDERNAME, USERFOLDER_NAME
+ from grokadmin import AUTH_FOLDERNAME, USERFOLDER_NAME
sm = self.context.getSiteManager()
if AUTH_FOLDERNAME not in list(sm.keys()):
More information about the Checkins
mailing list