[Checkins] SVN: zope.fanstatic/trunk/src/zope/fanstatic/ proper check whether the base_url has been set. fix import

[Jan-Wijbrand Kolman]

Log message for revision 118759:
  proper check whether the base_url has been set. fix import

Changed:
  U   zope.fanstatic/trunk/src/zope/fanstatic/tests/tests.py
  U   zope.fanstatic/trunk/src/zope/fanstatic/zopesupport.py

-=-
Modified: zope.fanstatic/trunk/src/zope/fanstatic/tests/tests.py
===================================================================
--- zope.fanstatic/trunk/src/zope/fanstatic/tests/tests.py	2010-12-08 10:30:24 UTC (rev 118758)
+++ zope.fanstatic/trunk/src/zope/fanstatic/tests/tests.py	2010-12-08 13:23:25 UTC (rev 118759)
@@ -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
@@ -23,7 +22,7 @@
             resource_factory, (IBrowserRequest,), Interface, foo.name)
 
     def setup_middleware(self, app):
-        return Inject(app)
+        return fanstatic.Injector(app)
 
 def test_suite():
     readme = doctest.DocFileSuite(

Modified: zope.fanstatic/trunk/src/zope/fanstatic/zopesupport.py
===================================================================
--- zope.fanstatic/trunk/src/zope/fanstatic/zopesupport.py	2010-12-08 10:30:24 UTC (rev 118758)
+++ zope.fanstatic/trunk/src/zope/fanstatic/zopesupport.py	2010-12-08 13:23:25 UTC (rev 118759)
@@ -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):
@@ -34,6 +34,6 @@
 
     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