ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-19 04:57:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tweak webish to use resource_filename to find css and html files

Browse Source 
using sibpath to find web template files relative to source code is functional
when running from source environments, but not especially flexible when running
from bundled built environments.  the more 'orthodox' mechanism, pkg_resources,
in theory at least, knows how to find resource files in various environments.

this makes the 'web' directory in allmydata into an actual allmydata.web module
(since pkg_resources looks for files relative to a named module, and that module
must be importable) and uses pkg_resources.resource_filename to find the files
therein.
This commit is contained in:
robk-tahoe 2008-01-22 17:44:58 -07:00
parent 284c1652a9
commit 6ef4606534
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
src/allmydata/web/__init__.py Normal file
View File

8
src/allmydata/webish.py
View File

@ -8,7 +8,7 @@ from twisted.internet import defer
from twisted.internet.interfaces import IConsumer
from nevow import inevow, rend, loaders, appserver, url, tags as T
from nevow.static import File as nevow_File # TODO: merge with static.File?
from allmydata.util import fileutil, sibpath
from allmydata.util import fileutil
import simplejson
from allmydata.interfaces import IDownloadTarget, IDirectoryNode, IFileNode, \
IMutableFileNode
@ -20,8 +20,10 @@ from zope.interface import implements, Interface
import urllib
from formless import webform
from nevow.util import resource_filename
def getxmlfile(name):
return loaders.xmlfile(sibpath.sibpath(__file__, "web/%s" % name))
return loaders.xmlfile(resource_filename('allmydata.web', '%s' % name))
class IClient(Interface):
pass
@ -1302,7 +1304,7 @@ class Root(rend.Page):
return rend.Page.locateChild(self, ctx, segments)
child_webform_css = webform.defaultCSS
child_tahoe_css = nevow_File(sibpath.sibpath(__file__, "web/tahoe.css"))
child_tahoe_css = nevow_File(resource_filename('allmydata.web', 'tahoe.css'))
child_provisioning = provisioning.ProvisioningTool()