[Checkins] SVN: grok/trunk/ getApplication() is not deprecated, merely the location has changed. It is still imported by grok.

[Jan-Wijbrand Kolman]

Log message for revision 119354:
  getApplication() is not deprecated, merely the location has changed. It is still imported by grok.

Changed:
  U   grok/trunk/doc/reference/functions.rst
  U   grok/trunk/src/grok/__init__.py

-=-
Modified: grok/trunk/doc/reference/functions.rst
===================================================================
--- grok/trunk/doc/reference/functions.rst	2011-01-04 15:24:27 UTC (rev 119353)
+++ grok/trunk/doc/reference/functions.rst	2011-01-04 15:25:06 UTC (rev 119354)
@@ -66,7 +66,7 @@
 
     import grok
     from zope import schema
-    
+
     class Edit(grok.EditForm):
         fields = grok.Fields(
             b = schema.TextLine(title=u"Beta"),
@@ -83,11 +83,6 @@
 
 .. autofunction:: grok.getApplication()
 
-    .. deprecated:: 1.4
-       This function has been moved to :mod:`grokcore.site`. Use
-       :func:`grokcore.site.getApplication` instead.
-
-
 :func:`grok.getSite`
 ====================
 
@@ -97,7 +92,7 @@
 
 .. seealso::
 
-    Site objects are instances of :class:`grok.Site`. Typically this will 
+    Site objects are instances of :class:`grok.Site`. Typically this will
     also be your main :class:`grok.Application` root object, which inherits
     from :class:`grok.Site`. Normally you will want to use
     `grok.getApplication` to get the application object, as `grok.getSite`

Modified: grok/trunk/src/grok/__init__.py
===================================================================
--- grok/trunk/src/grok/__init__.py	2011-01-04 15:24:27 UTC (rev 119353)
+++ grok/trunk/src/grok/__init__.py	2011-01-04 15:25:06 UTC (rev 119354)
@@ -81,12 +81,15 @@
     ContainerModifiedEvent)
 
 from grok.events import ApplicationInitializedEvent
+
 from grok.components import Application
 from grok.components import View, Form, AddForm, EditForm, DisplayForm
 from grok.components import XMLRPC, REST, JSON
-from grokcore.traverser import Traverser
 from grok.components import Indexes
 from grok.components import Role
+
+from grokcore.traverser import Traverser
+
 from grok.interfaces import IRESTSkinType, IRESTLayer
 from grok.interfaces import IApplicationInitializedEvent