Skip to content
This repository has been archived by the owner on Feb 9, 2023. It is now read-only.

Commit

Permalink
proper check whether the base_url has been set. fix import
Browse files Browse the repository at this point in the history
  • Loading branch information
janwijbrand committed Dec 8, 2010
1 parent bdfb24b commit ba569cb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions src/zope/fanstatic/tests/tests.py
Expand Up @@ -6,8 +6,7 @@
from zope.app.wsgi.testlayer import BrowserLayer
from zope.publisher.interfaces.browser import IBrowserRequest

from fanstatic import Inject

import fanstatic
from zope.fanstatic.zcml import create_factory
from zope.fanstatic.tests.view import foo
import zope.fanstatic.tests
Expand All @@ -23,7 +22,7 @@ def testSetUp(self):
resource_factory, (IBrowserRequest,), Interface, foo.name)

def setup_middleware(self, app):
return Inject(app)
return fanstatic.Injector(app)

def test_suite():
readme = doctest.DocFileSuite(
Expand Down
4 changes: 2 additions & 2 deletions src/zope/fanstatic/zopesupport.py
Expand Up @@ -10,7 +10,7 @@
@adapter(IEndRequestEvent)
def set_base_url_on_needed_inclusions(event):
needed = fanstatic.get_current_needed_inclusions()
if not needed.base_url:
if needed.base_url is None:
needed.base_url = absoluteURL(None, event.request)

class ZopeFanstaticResource(object):
Expand All @@ -34,6 +34,6 @@ def traverse(self, name, furtherPath):

def __str__(self):
needed = fanstatic.get_current_needed_inclusions()
if not needed.base_url:
if needed.base_url is None:
needed.base_url = absoluteURL(None, self.request)
return needed.library_url(self.library) + self.name

0 comments on commit ba569cb

Please sign in to comment.