Skip to content

Commit

Permalink
update grok.util.url() to work correctly with grokcore.view.util.url()
Browse files Browse the repository at this point in the history
  • Loading branch information
janwijbrand committed Apr 3, 2013
1 parent c9fec79 commit f7f40b7
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Grok changes
************

1.10.4 (unreleased)
===================

- Nothing changed yet.
1.11 (unreleased)
=================

- Update ``grok.util.application_url()`` to work correctly with
``grokcore.view.util.url()``.

1.10.3 (2012-05-10)
===================
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def read(*rnames):

setup(
name='grok',
version='1.10.4.dev0',
version='1.11.dev0',
author='Grok Team',
author_email='grok-dev@zope.org',
url='http://grok.zope.org',
Expand Down Expand Up @@ -54,7 +54,7 @@ def read(*rnames):
'grokcore.security[role] >= 1.6',
'grokcore.site >= 1.6.1',
'grokcore.traverser >= 1.1',
'grokcore.view >= 2.7',
'grokcore.view >= 2.8',
'grokcore.viewlet >= 1.10',
'grokcore.view [security_publication]',
'grokcore.xmlrpc >= 1.2',
Expand Down
6 changes: 3 additions & 3 deletions src/grok/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

from zope import interface
from zope.schema.interfaces import WrongType
from grokcore.view.util import url
from grokcore.view.util import url, ASIS
from grokcore.site.util import getApplication


Expand Down Expand Up @@ -48,12 +48,12 @@ def applySkin(request, skin, skin_type):
interface.directlyProvides(request, *ifaces)


def application_url(request, obj, name=None, data={}):
def application_url(request, obj, name=None, skin=ASIS, data={}):
"""Return the URL of the nearest enclosing :class:`grok.Application`.
Raises :exc:`ValueError` if no application can be found.
"""
return url(request, getApplication(), name, data)
return url(request, getApplication(), name=name, skin=skin, data=data)


def create_application(factory, container, name):
Expand Down

0 comments on commit f7f40b7

Please sign in to comment.