From z3-checkins at codespeak.net Wed Oct 3 19:04:54 2007 From: z3-checkins at codespeak.net (z3-checkins at codespeak.net) Date: Wed, 3 Oct 2007 19:04:54 +0200 (CEST) Subject: [z3-checkins] Find the unexpected Message-ID: <20070902120926.3904.qmail@MS-167-118.dyn-ip.SPb.SkyLink.RU> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20071003/cacd6d07/attachment-0001.htm From philikon at codespeak.net Wed Oct 3 22:10:27 2007 From: philikon at codespeak.net (philikon at codespeak.net) Date: Wed, 3 Oct 2007 22:10:27 +0200 (CEST) Subject: [z3-checkins] r47128 - z3/NudgeNudge/trunk Message-ID: <20071003201027.DDAF9818A@code0.codespeak.net> Author: philikon Date: Wed Oct 3 22:10:26 2007 New Revision: 47128 Modified: z3/NudgeNudge/trunk/buildout.cfg Log: Nail the ZODB Modified: z3/NudgeNudge/trunk/buildout.cfg ============================================================================== --- z3/NudgeNudge/trunk/buildout.cfg (original) +++ z3/NudgeNudge/trunk/buildout.cfg Wed Oct 3 22:10:26 2007 @@ -2,6 +2,10 @@ parts = app data instance server test develop = . deliverance find-links = http://download.zope.org/distribution/ +versions = versions + +[versions] +ZODB3 = 3.8.0b2 [zope3] # this dead chicken is needed by some other recipe(s) From philikon at codespeak.net Wed Oct 3 22:10:38 2007 From: philikon at codespeak.net (philikon at codespeak.net) Date: Wed, 3 Oct 2007 22:10:38 +0200 (CEST) Subject: [z3-checkins] r47129 - z3/NudgeNudge/trunk Message-ID: <20071003201038.4872A818F@code0.codespeak.net> Author: philikon Date: Wed Oct 3 22:10:37 2007 New Revision: 47129 Modified: z3/NudgeNudge/trunk/nudge.ini Log: Use Paste#http server Modified: z3/NudgeNudge/trunk/nudge.ini ============================================================================== --- z3/NudgeNudge/trunk/nudge.ini (original) +++ z3/NudgeNudge/trunk/nudge.ini Wed Oct 3 22:10:37 2007 @@ -15,12 +15,6 @@ file_storage = parts/data/Data.fs [server:main] -use = egg:PasteScript#wsgiutils -host = 127.0.0.1 -port = 8080 - -# Here's an example of how to serve usinig twisted.web2 -[server:twisted] -use = egg:PasteScript#twisted +use = egg:Paste#http host = 127.0.0.1 port = 8080 From philikon at codespeak.net Wed Oct 3 22:17:09 2007 From: philikon at codespeak.net (philikon at codespeak.net) Date: Wed, 3 Oct 2007 22:17:09 +0200 (CEST) Subject: [z3-checkins] r47130 - z3/NudgeNudge/trunk/src/nudgenudge Message-ID: <20071003201709.5897B80AE@code0.codespeak.net> Author: philikon Date: Wed Oct 3 22:17:08 2007 New Revision: 47130 Modified: z3/NudgeNudge/trunk/src/nudgenudge/configure.zcml Log: Treat grok as a dependency. Load it. Modified: z3/NudgeNudge/trunk/src/nudgenudge/configure.zcml ============================================================================== --- z3/NudgeNudge/trunk/src/nudgenudge/configure.zcml (original) +++ z3/NudgeNudge/trunk/src/nudgenudge/configure.zcml Wed Oct 3 22:17:08 2007 @@ -1 +1,5 @@ - + + + + From philikon at codespeak.net Wed Oct 3 22:17:44 2007 From: philikon at codespeak.net (philikon at codespeak.net) Date: Wed, 3 Oct 2007 22:17:44 +0200 (CEST) Subject: [z3-checkins] r47131 - in z3/NudgeNudge/trunk: . src/nudgenudge var Message-ID: <20071003201744.A69CF816C@code0.codespeak.net> Author: philikon Date: Wed Oct 3 22:17:44 2007 New Revision: 47131 Added: z3/NudgeNudge/trunk/site.zcml - copied, changed from r47126, z3/NudgeNudge/trunk/src/nudgenudge/site.zcml z3/NudgeNudge/trunk/var/ (props changed) Removed: z3/NudgeNudge/trunk/src/nudgenudge/site.zcml Modified: z3/NudgeNudge/trunk/buildout.cfg z3/NudgeNudge/trunk/nudge.ini Log: No longer use instances. Use the zopeproject-like model. Modified: z3/NudgeNudge/trunk/buildout.cfg ============================================================================== --- z3/NudgeNudge/trunk/buildout.cfg (original) +++ z3/NudgeNudge/trunk/buildout.cfg Wed Oct 3 22:17:44 2007 @@ -1,5 +1,5 @@ [buildout] -parts = app data instance server test +parts = app test develop = . deliverance find-links = http://download.zope.org/distribution/ versions = versions @@ -7,37 +7,17 @@ [versions] ZODB3 = 3.8.0b2 -[zope3] -# this dead chicken is needed by some other recipe(s) -location = - -[server] -recipe = zc.recipe.egg -eggs = ${app:eggs} - zope.paste - PasteDeploy - Deliverance - PasteScript - WSGIUtils -extra-paths = ${zope3:location}/lib/python - [app] -database = data -eggs = setuptools - grok - nudgenudge -recipe = zc.zope3recipes:app -site.zcml = - -[data] -recipe = zc.recipe.filestorage - -[instance] -recipe = zc.zope3recipes:instance -application = app -zope.conf = ${data:zconfig} +recipe = zc.recipe.egg +eggs = NudgeNudge + zope.paste + Paste + PasteDeploy + PasteScript + Deliverance +interpreter = python [test] recipe = zc.recipe.testrunner -eggs = nudgenudge +eggs = NudgeNudge defaults = ['--tests-pattern', '^f?tests$', '-v'] Modified: z3/NudgeNudge/trunk/nudge.ini ============================================================================== --- z3/NudgeNudge/trunk/nudge.ini (original) +++ z3/NudgeNudge/trunk/nudge.ini Wed Oct 3 22:17:44 2007 @@ -11,8 +11,8 @@ [app:zope] use = egg:zope.paste -site_definition = parts/app/site.zcml -file_storage = parts/data/Data.fs +site_definition = site.zcml +file_storage = var/Data.fs [server:main] use = egg:Paste#http Copied: z3/NudgeNudge/trunk/site.zcml (from r47126, z3/NudgeNudge/trunk/src/nudgenudge/site.zcml) ============================================================================== --- z3/NudgeNudge/trunk/src/nudgenudge/site.zcml (original) +++ z3/NudgeNudge/trunk/site.zcml Wed Oct 3 22:17:44 2007 @@ -1,34 +1,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From philikon at codespeak.net Wed Oct 3 22:32:17 2007 From: philikon at codespeak.net (philikon at codespeak.net) Date: Wed, 3 Oct 2007 22:32:17 +0200 (CEST) Subject: [z3-checkins] r47134 - z3/NudgeNudge/trunk Message-ID: <20071003203217.AB59F817E@code0.codespeak.net> Author: philikon Date: Wed Oct 3 22:32:17 2007 New Revision: 47134 Modified: z3/NudgeNudge/trunk/INSTALL.txt Log: update installation instructions Modified: z3/NudgeNudge/trunk/INSTALL.txt ============================================================================== --- z3/NudgeNudge/trunk/INSTALL.txt (original) +++ z3/NudgeNudge/trunk/INSTALL.txt Wed Oct 3 22:32:17 2007 @@ -7,39 +7,24 @@ $ svn co http://codespeak.net/svn/z3/NudgeNudge/trunk NudgeNudge -2. Edit buildout.cfg to point to your Zope 3 installation:: +2. Use an existing buildout to bootstrap the buildout in order to + obtain the ``buildout`` script:: - [zope3] - location = /path/to/Zope-3.3.x + $ .../path/to/sandbox/bin/buildout bootstrap -3. Bootstrap zc.buildout to obtain the ``buildout`` script:: +3. Run the buildout to install required packages (grok, Deliverance, + PasteDeploy, etc.) and create the necessary start scripts:: - $ python2.4 bootstrap/bootstrap.py + $ bin/buildout + ...lots of output here... -4. Run the buildout to install required packages (grok, deliverance, - paste.deploy, zope.paste, etc.) and create the Zope 3 configuration - for NudgeNudge automatically:: +4. We are now able start up Zope using the following command:: - $ bin/buildout - ...lots of output here... - -5. We are now able start up Zope using the following command:: - - $ parts/instance/bin/runzope + $ bin/paster serve nudge.ini Then we can create a NudgeNudge application object by pointing our - webbrowser to http://localhost:8080. Let's call it "nudge". - -6. To run the NudgeNudge application using the PasteDeploy stack and - therefore themed using Deliverance, start the server using the - following command:: - - $ bin/paster serve nudge.ini - - You'll then be able to access the themed application at - http://localhost:8080/nudge and unthemed at - http://localhost:8080/notheme/nudge. + webbrowser to http://localhost:8080/notheme. Let's call it + "nudge". - Note that the Deliverance middleware requires lxml to do the - theming which is known to have problems on certain platforms, - e.g. Mac OS X. + Then you can looked at the themed application at + http://localhost:8080/nudge. From philikon at codespeak.net Wed Oct 3 22:41:39 2007 From: philikon at codespeak.net (philikon at codespeak.net) Date: Wed, 3 Oct 2007 22:41:39 +0200 (CEST) Subject: [z3-checkins] r47135 - z3/NudgeNudge/trunk Message-ID: <20071003204139.26637817E@code0.codespeak.net> Author: philikon Date: Wed Oct 3 22:41:38 2007 New Revision: 47135 Added: z3/NudgeNudge/trunk/deploy.ini - copied unchanged from r47131, z3/NudgeNudge/trunk/nudge.ini Removed: z3/NudgeNudge/trunk/nudge.ini Log: Rename according to standard zopeproject layout Deleted: /z3/NudgeNudge/trunk/nudge.ini ============================================================================== --- /z3/NudgeNudge/trunk/nudge.ini Wed Oct 3 22:41:38 2007 +++ (empty file) @@ -1,20 +0,0 @@ -[composite:main] -use = egg:Paste#urlmap -/ = themed -/notheme = zope - -[filter-app:themed] -use = egg:Deliverance -theme_uri = /@@/nudgenudge/www.python.org/pypi/index.html -rule_uri = /@@/nudgenudge/rules.xml -next = zope - -[app:zope] -use = egg:zope.paste -site_definition = site.zcml -file_storage = var/Data.fs - -[server:main] -use = egg:Paste#http -host = 127.0.0.1 -port = 8080 From philikon at codespeak.net Wed Oct 3 23:01:32 2007 From: philikon at codespeak.net (philikon at codespeak.net) Date: Wed, 3 Oct 2007 23:01:32 +0200 (CEST) Subject: [z3-checkins] r47137 - in z3/NudgeNudge/trunk: . log src/nudgenudge Message-ID: <20071003210132.2E618818D@code0.codespeak.net> Author: philikon Date: Wed Oct 3 23:01:31 2007 New Revision: 47137 Added: z3/NudgeNudge/trunk/log/ (props changed) z3/NudgeNudge/trunk/simple.ini z3/NudgeNudge/trunk/src/nudgenudge/startup.py (contents, props changed) z3/NudgeNudge/trunk/zdaemon.conf z3/NudgeNudge/trunk/zope.conf Modified: z3/NudgeNudge/trunk/buildout.cfg z3/NudgeNudge/trunk/deploy.ini z3/NudgeNudge/trunk/setup.py Log: More like zopeproject-based sandbox Modified: z3/NudgeNudge/trunk/buildout.cfg ============================================================================== --- z3/NudgeNudge/trunk/buildout.cfg (original) +++ z3/NudgeNudge/trunk/buildout.cfg Wed Oct 3 23:01:31 2007 @@ -10,7 +10,6 @@ [app] recipe = zc.recipe.egg eggs = NudgeNudge - zope.paste Paste PasteDeploy PasteScript Modified: z3/NudgeNudge/trunk/deploy.ini ============================================================================== --- z3/NudgeNudge/trunk/deploy.ini (original) +++ z3/NudgeNudge/trunk/deploy.ini Wed Oct 3 23:01:31 2007 @@ -10,9 +10,7 @@ next = zope [app:zope] -use = egg:zope.paste -site_definition = site.zcml -file_storage = var/Data.fs +use = egg:NudgeNudge [server:main] use = egg:Paste#http Modified: z3/NudgeNudge/trunk/setup.py ============================================================================== --- z3/NudgeNudge/trunk/setup.py (original) +++ z3/NudgeNudge/trunk/setup.py Wed Oct 3 23:01:31 2007 @@ -28,4 +28,11 @@ 'zope.app.securitypolicy', 'zope.app.zcmlfiles', ], + entry_points = """ + [console_scripts] + nudgenudge-debug = nudgenudge.startup:interactive_debug_prompt + nudgenudge-ctl = nudgenudge.startup:zdaemon_controller + [paste.app_factory] + main = nudgenudge.startup:application_factory + """ ) Added: z3/NudgeNudge/trunk/simple.ini ============================================================================== --- (empty file) +++ z3/NudgeNudge/trunk/simple.ini Wed Oct 3 23:01:31 2007 @@ -0,0 +1,7 @@ +[app:main] +use = egg:NudgeNudge + +[server:main] +use = egg:Paste#http +host = 127.0.0.1 +port = 8080 Added: z3/NudgeNudge/trunk/src/nudgenudge/startup.py ============================================================================== --- (empty file) +++ z3/NudgeNudge/trunk/src/nudgenudge/startup.py Wed Oct 3 23:01:31 2007 @@ -0,0 +1,35 @@ +import os +import sys +import code +import zdaemon.zdctl +import zope.app.wsgi +import zope.app.debug + +def application_factory(global_conf, conf='zope.conf'): + zope_conf = os.path.join(global_conf['here'], conf) + return zope.app.wsgi.getWSGIApplication(zope_conf) + +def interactive_debug_prompt(zope_conf='zope.conf'): + db = zope.app.wsgi.config(zope_conf) + debugger = zope.app.debug.Debugger.fromDatabase(db) + # Invoke an interactive interpreter shell + banner = ("Welcome to the interactive debug prompt.\n" + "The 'root' variable contains the ZODB root folder.\n" + "The 'app' variable contains the Debugger, 'app.publish(path)' " + "simulates a request.") + code.interact(banner=banner, local={'debugger': debugger, + 'app': debugger, + 'root': debugger.root()}) + +class ControllerCommands(zdaemon.zdctl.ZDCmd): + + def do_debug(self, rest): + interactive_debug_prompt() + + def help_debug(self): + print "debug -- Initialize the application, providing a debugger" + print " object at an interactive Python prompt." + +def zdaemon_controller(zdaemon_conf='zdaemon.conf'): + args = ['-C', zdaemon_conf] + sys.argv[1:] + zdaemon.zdctl.main(args, options=None, cmdclass=ControllerCommands) Added: z3/NudgeNudge/trunk/zdaemon.conf ============================================================================== --- (empty file) +++ z3/NudgeNudge/trunk/zdaemon.conf Wed Oct 3 23:01:31 2007 @@ -0,0 +1,8 @@ + + program bin/paster serve deploy.ini + daemon on + transcript log/zdaemon.log + socket-name var/zdaemonsock + # Enable this to run the child process as a different user + # user zope + Added: z3/NudgeNudge/trunk/zope.conf ============================================================================== --- (empty file) +++ z3/NudgeNudge/trunk/zope.conf Wed Oct 3 23:01:31 2007 @@ -0,0 +1,38 @@ +# Identify the component configuration used to define the site: +site-definition site.zcml + + + # Standard Filestorage + + path var/Data.fs + + +# Uncomment this if you want to connect to a ZEO server instead: +# +# server localhost:8100 +# storage 1 +# # ZEO client cache, in bytes +# cache-size 20MB +# # Uncomment to have a persistent disk cache +# #client zeo1 +# + + + + # This sets up logging to both a file and to standard output + # (STDOUT). The "path" setting can be a relative or absolute + # filesystem path or the tokens STDOUT or STDERR. + + + path log/z3.log + formatter zope.exceptions.log.Formatter + + + + path STDOUT + formatter zope.exceptions.log.Formatter + + + +# Uncomment this to switch on developer mode (e.g. for APIDoc) +#devmode on From philikon at codespeak.net Thu Oct 4 00:03:31 2007 From: philikon at codespeak.net (philikon at codespeak.net) Date: Thu, 4 Oct 2007 00:03:31 +0200 (CEST) Subject: [z3-checkins] r47139 - z3/NudgeNudge/trunk Message-ID: <20071003220331.2D8AC8171@code0.codespeak.net> Author: philikon Date: Thu Oct 4 00:03:30 2007 New Revision: 47139 Modified: z3/NudgeNudge/trunk/buildout.cfg Log: Nail a couple of more eggs Modified: z3/NudgeNudge/trunk/buildout.cfg ============================================================================== --- z3/NudgeNudge/trunk/buildout.cfg (original) +++ z3/NudgeNudge/trunk/buildout.cfg Thu Oct 4 00:03:30 2007 @@ -6,6 +6,8 @@ [versions] ZODB3 = 3.8.0b2 +docutils = 0.4 +zope.app.keyreference = 3.4.0a1 [app] recipe = zc.recipe.egg From philikon at codespeak.net Thu Oct 4 00:17:26 2007 From: philikon at codespeak.net (philikon at codespeak.net) Date: Thu, 4 Oct 2007 00:17:26 +0200 (CEST) Subject: [z3-checkins] r47140 - z3/NudgeNudge/trunk Message-ID: <20071003221726.C530A8173@code0.codespeak.net> Author: philikon Date: Thu Oct 4 00:17:25 2007 New Revision: 47140 Modified: z3/NudgeNudge/trunk/buildout.cfg Log: Nail more eggs Modified: z3/NudgeNudge/trunk/buildout.cfg ============================================================================== --- z3/NudgeNudge/trunk/buildout.cfg (original) +++ z3/NudgeNudge/trunk/buildout.cfg Thu Oct 4 00:17:25 2007 @@ -7,6 +7,8 @@ [versions] ZODB3 = 3.8.0b2 docutils = 0.4 +zope.interface = 3.4.0 +zope.security = 3.4.0b5 zope.app.keyreference = 3.4.0a1 [app] From philikon at codespeak.net Thu Oct 4 00:17:51 2007 From: philikon at codespeak.net (philikon at codespeak.net) Date: Thu, 4 Oct 2007 00:17:51 +0200 (CEST) Subject: [z3-checkins] r47141 - z3/NudgeNudge/trunk Message-ID: <20071003221751.2E8708173@code0.codespeak.net> Author: philikon Date: Thu Oct 4 00:17:50 2007 New Revision: 47141 Modified: z3/NudgeNudge/trunk/deploy.ini Log: Can't do the composite app for now Modified: z3/NudgeNudge/trunk/deploy.ini ============================================================================== --- z3/NudgeNudge/trunk/deploy.ini (original) +++ z3/NudgeNudge/trunk/deploy.ini Thu Oct 4 00:17:50 2007 @@ -1,9 +1,4 @@ -[composite:main] -use = egg:Paste#urlmap -/ = themed -/notheme = zope - -[filter-app:themed] +[filter-app:main] use = egg:Deliverance theme_uri = /@@/nudgenudge/www.python.org/pypi/index.html rule_uri = /@@/nudgenudge/rules.xml From z3-checkins at codespeak.net Thu Oct 4 12:31:09 2007 From: z3-checkins at codespeak.net (VIAGRA � Official Site) Date: Thu, 4 Oct 2007 12:31:09 +0200 (CEST) Subject: [z3-checkins] October 70% OFF Message-ID: <20071004053255.21487.qmail@host-85-237-46-205.dsl.sura.ru> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20071004/3bdbd4cf/attachment-0001.htm From ianb at codespeak.net Fri Oct 12 17:36:56 2007 From: ianb at codespeak.net (ianb at codespeak.net) Date: Fri, 12 Oct 2007 17:36:56 +0200 (CEST) Subject: [z3-checkins] r47409 - z3/deliverance/DeliveranceVHoster/trunk/dvhoster Message-ID: <20071012153656.53D9C821D@code0.codespeak.net> Author: ianb Date: Fri Oct 12 17:36:55 2007 New Revision: 47409 Modified: z3/deliverance/DeliveranceVHoster/trunk/dvhoster/model.py Log: Strip newlines off of some file contents (#211). Requires new/svn trunk of OHM. Modified: z3/deliverance/DeliveranceVHoster/trunk/dvhoster/model.py ============================================================================== --- z3/deliverance/DeliveranceVHoster/trunk/dvhoster/model.py (original) +++ z3/deliverance/DeliveranceVHoster/trunk/dvhoster/model.py Fri Oct 12 17:36:55 2007 @@ -229,13 +229,13 @@ return os.path.join(self.base_dir, 'static') remote_uris = descriptors.json_converter( - persist.file_property('remote_uris.txt')) - theme_uri = persist.file_property('theme_uri.txt') + persist.file_property('remote_uris.txt', strip=True)) + theme_uri = persist.file_property('theme_uri.txt', strip=True) redirects = descriptors.json_converter( - persist.file_property('redirects.txt', default='[]')) + persist.file_property('redirects.txt', default='[]', strip=True)) additional_request_headers = descriptors.json_converter( - persist.file_property('additional_request_headers.txt', default='[]')) + persist.file_property('additional_request_headers.txt', default='[]', strip=True)) def aliases__rename(self, old_aliases, new_aliases): dropped = list(old_aliases) From z3-checkins at codespeak.net Sat Oct 13 18:37:24 2007 From: z3-checkins at codespeak.net (z3-checkins at codespeak.net) Date: Sat, 13 Oct 2007 18:37:24 +0200 (CEST) Subject: [z3-checkins] Love Products Message-ID: <20071013073929.4133.qmail@ehr231.neoplus.adsl.tpnet.pl> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20071013/3e588090/attachment.htm From ianb at codespeak.net Mon Oct 15 18:59:20 2007 From: ianb at codespeak.net (ianb at codespeak.net) Date: Mon, 15 Oct 2007 18:59:20 +0200 (CEST) Subject: [z3-checkins] r47471 - z3/deliverance/trunk/deliverance Message-ID: <20071015165920.E17068116@code0.codespeak.net> Author: ianb Date: Mon Oct 15 18:59:20 2007 New Revision: 47471 Modified: z3/deliverance/trunk/deliverance/utils.py z3/deliverance/trunk/deliverance/xslt.py Log: Replace some truth tests of elements, which actually were testing if there were no subelements when they probably meant to be testing for None Modified: z3/deliverance/trunk/deliverance/utils.py ============================================================================== --- z3/deliverance/trunk/deliverance/utils.py (original) +++ z3/deliverance/trunk/deliverance/utils.py Mon Oct 15 18:59:20 2007 @@ -160,7 +160,7 @@ inserts the element el into the beginning of body element of the document given """ - if not el: + if el is None: return body = doc.find('body') if body is None: @@ -427,7 +427,9 @@ root = etree.Element("content") - if content: + ## FIXME: this was originally "if content:", but I think it actually + ## was meant to catch content==None. But I'm not sure. + if content is not None: request_doc = etree.SubElement(root,"document") request_doc.set("content",self.REQUEST_CONTENT) request_doc.append(content) Modified: z3/deliverance/trunk/deliverance/xslt.py ============================================================================== --- z3/deliverance/trunk/deliverance/xslt.py (original) +++ z3/deliverance/trunk/deliverance/xslt.py Mon Oct 15 18:59:20 2007 @@ -110,7 +110,7 @@ return copy.deepcopy(content) #print "TRANSFORM: %s" % etree.tostring(self.xslt_wrapper) - if content: + if content is not None: content = self.aggregate(self.resolve_uri, self.rules, content) return self.transform(content).getroot() else: @@ -322,7 +322,7 @@ return err = self.format_error("no content matched", rule) - if err: + if err is not None: # if the content was possibly moved, check for a marker instead of the content check_xpath = self.get_content_xpath(rule) From z3-checkins at codespeak.net Mon Oct 15 21:14:28 2007 From: z3-checkins at codespeak.net (VIAGRA � Official Site) Date: Mon, 15 Oct 2007 21:14:28 +0200 (CEST) Subject: [z3-checkins] October 71% OFF Message-ID: <20071015-21625.21614.qmail@XPLR-TS-11-TOR-72-45-77-93.barrettxplore.com> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20071015/33550cdb/attachment.htm From z3-checkins at codespeak.net Tue Oct 16 15:21:18 2007 From: z3-checkins at codespeak.net (VIAGRA � Official Site) Date: Tue, 16 Oct 2007 15:21:18 +0200 (CEST) Subject: [z3-checkins] October 76% OFF Message-ID: <20071016082617.17525.qmail@hard-gw.novline.ru> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20071016/5465bff0/attachment.htm From z3-checkins at codespeak.net Sat Oct 20 12:59:18 2007 From: z3-checkins at codespeak.net (VIAGRA � Official Site) Date: Sat, 20 Oct 2007 12:59:18 +0200 (CEST) Subject: [z3-checkins] October 76% OFF Message-ID: <20071020040100.9287.qmail@dsl.dynamic859829151.ttnet.net.tr> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20071020/c0912423/attachment.htm From z3-checkins at codespeak.net Sat Oct 20 16:22:40 2007 From: z3-checkins at codespeak.net (VIAGRA � Official Site) Date: Sat, 20 Oct 2007 16:22:40 +0200 (CEST) Subject: [z3-checkins] October 73% OFF Message-ID: <20071020163257.7378.qmail@caching2-true.asianet.co.th> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20071020/71cb2226/attachment-0001.htm From z3-checkins at codespeak.net Sat Oct 27 01:49:25 2007 From: z3-checkins at codespeak.net (VIAGRA � Official Site) Date: Sat, 27 Oct 2007 01:49:25 +0200 (CEST) Subject: [z3-checkins] October 79% OFF Message-ID: <20071025-24123.24743.qmail@client-201.240.209.89.speedy.net.pe> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20071027/675d7294/attachment.htm From z3-checkins at codespeak.net Mon Oct 29 20:14:43 2007 From: z3-checkins at codespeak.net (VIAGRA � Official Site) Date: Mon, 29 Oct 2007 20:14:43 +0100 (CET) Subject: [z3-checkins] October 72% OFF Message-ID: <20071029111454.4103.qmail@addressness.socket.volia.net> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20071029/e11a55c0/attachment.htm From z3-checkins at codespeak.net Mon Nov 12 12:10:14 2007 From: z3-checkins at codespeak.net (VIAGRA � Official Site) Date: Mon, 12 Nov 2007 12:10:14 +0100 (CET) Subject: [z3-checkins] November 79% OFF Message-ID: <20071112051017.6516.qmail@ppp91-122-52-230.pppoe.avangard-dsl.ru> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20071112/502e1a29/attachment.htm From ianb at codespeak.net Wed Nov 14 23:54:35 2007 From: ianb at codespeak.net (ianb at codespeak.net) Date: Wed, 14 Nov 2007 23:54:35 +0100 (CET) Subject: [z3-checkins] r48694 - z3/deliverance/DeliveranceVHoster/trunk Message-ID: <20071114225435.2B6B381CB@code0.codespeak.net> Author: ianb Date: Wed Nov 14 23:54:34 2007 New Revision: 48694 Added: z3/deliverance/DeliveranceVHoster/trunk/fassembler_config.ini_tmpl Log: fassembler config template Added: z3/deliverance/DeliveranceVHoster/trunk/fassembler_config.ini_tmpl ============================================================================== --- (empty file) +++ z3/deliverance/DeliveranceVHoster/trunk/fassembler_config.ini_tmpl Wed Nov 14 23:54:34 2007 @@ -0,0 +1,56 @@ +# +# DeliveranceVHoster - environment configuration +# +[DEFAULT] +## FIXME: should be based on... something else +email_to = ianb at openplans.org +smtp_server = localhost +error_email_from = paste@{{env.fq_hostname}} + +[server:main] +use = egg:Paste#http +host = {{config.host}} +port = {{config.port}} + +[app:main] +use = egg:DeliveranceVHoster +data_dir = {{env.base_path}}/var/deliverance/hosts +#debug_headers = true +# To view bodies: +#debug_bodies = true +# To disable the rewriting of links: +#rewrite_links = false +# Use this to remove certain headers from any request: +# (note: this matches the *environmental key*, not the original header) +clean_environ_headers_regex = ^HTTP_X_OPENPLANS + +# WARNING: *THE LINE BELOW MUST BE FALSE ON A PRODUCTION ENVIRONMENT* +set debug = false + +logger = {{env.base_path}}/logs/deliverance/dvhoster.log + +init_domain = {{env.base_path}}/src/deliverance/openplans_hooks/openplans_hooks.py +find_remove_uri = {{env.base_path}}/src/deliverance/openplans_hooks/openplans_hooks.py +should_theme_uri = {{env.base_path}}/src/deliverance/openplans_hooks/openplans_hooks.py + +links_config = {{env.base_path}}/etc/build.ini + +## FIXME: this should be parameterized or something: +no_filter_zope = True + +## FIXME: this should also be parameterized: +domain_regex = ^(.*)\.flow\.openplans\.org$ + +transcluder_enabled = True +## FIXME: parameterized again: +## (maybe transcluder should have a same-host policy) +# this can be: +# all - any host is ok +# none - no hosts are ok +# localhost - only localhsost +# - only hosts matching the regex given +transcluder_ok_hosts = openplans.org|(.*)\.openplans.org|(.*)\.localhost.openplans\.org|localhost +transcluder_pool_size = 0 + +## FIXME: this should be parameterized: +default_theme_uri = http://www.openplans.org/theme.html From ianb at codespeak.net Thu Nov 15 05:53:42 2007 From: ianb at codespeak.net (ianb at codespeak.net) Date: Thu, 15 Nov 2007 05:53:42 +0100 (CET) Subject: [z3-checkins] r48705 - z3/deliverance/DeliveranceVHoster/trunk Message-ID: <20071115045342.AA55C8206@code0.codespeak.net> Author: ianb Date: Thu Nov 15 05:53:42 2007 New Revision: 48705 Modified: z3/deliverance/DeliveranceVHoster/trunk/fassembler_config.ini_tmpl Log: typos Modified: z3/deliverance/DeliveranceVHoster/trunk/fassembler_config.ini_tmpl ============================================================================== --- z3/deliverance/DeliveranceVHoster/trunk/fassembler_config.ini_tmpl (original) +++ z3/deliverance/DeliveranceVHoster/trunk/fassembler_config.ini_tmpl Thu Nov 15 05:53:42 2007 @@ -29,9 +29,9 @@ logger = {{env.base_path}}/logs/deliverance/dvhoster.log -init_domain = {{env.base_path}}/src/deliverance/openplans_hooks/openplans_hooks.py -find_remove_uri = {{env.base_path}}/src/deliverance/openplans_hooks/openplans_hooks.py -should_theme_uri = {{env.base_path}}/src/deliverance/openplans_hooks/openplans_hooks.py +init_domain = {{env.base_path}}/deliverance/src/openplans_hooks/openplans_hooks.py +find_remove_uri = {{env.base_path}}/deliverance/src/openplans_hooks/openplans_hooks.py +should_theme_uri = {{env.base_path}}/deliverance/src/openplans_hooks/openplans_hooks.py links_config = {{env.base_path}}/etc/build.ini From z3-checkins at codespeak.net Mon Nov 19 11:03:07 2007 From: z3-checkins at codespeak.net (VIAGRA � Official Site) Date: Mon, 19 Nov 2007 11:03:07 +0100 (CET) Subject: [z3-checkins] November 77% OFF Message-ID: <20071119142252.6065.qmail@gutless.canadian.volia.net> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20071119/e267c895/attachment-0001.htm From ianb at codespeak.net Tue Nov 20 22:58:24 2007 From: ianb at codespeak.net (ianb at codespeak.net) Date: Tue, 20 Nov 2007 22:58:24 +0100 (CET) Subject: [z3-checkins] r48881 - z3/deliverance/DeliveranceVHoster/trunk Message-ID: <20071120215824.B873D80FA@code0.codespeak.net> Author: ianb Date: Tue Nov 20 22:58:24 2007 New Revision: 48881 Modified: z3/deliverance/DeliveranceVHoster/trunk/fassembler_config.ini_tmpl Log: added master_site_domain and typo in setting Modified: z3/deliverance/DeliveranceVHoster/trunk/fassembler_config.ini_tmpl ============================================================================== --- z3/deliverance/DeliveranceVHoster/trunk/fassembler_config.ini_tmpl (original) +++ z3/deliverance/DeliveranceVHoster/trunk/fassembler_config.ini_tmpl Tue Nov 20 22:58:24 2007 @@ -24,13 +24,19 @@ # (note: this matches the *environmental key*, not the original header) clean_environ_headers_regex = ^HTTP_X_OPENPLANS +# This makes every site like the "master" www.openplans.org site, +# hosting multiple projects. If you set it to a specific domain, then +# any other domains will be treated as project vhosts: +master_site_domain = auto + + # WARNING: *THE LINE BELOW MUST BE FALSE ON A PRODUCTION ENVIRONMENT* set debug = false logger = {{env.base_path}}/logs/deliverance/dvhoster.log init_domain = {{env.base_path}}/deliverance/src/openplans_hooks/openplans_hooks.py -find_remove_uri = {{env.base_path}}/deliverance/src/openplans_hooks/openplans_hooks.py +find_remote_uri = {{env.base_path}}/deliverance/src/openplans_hooks/openplans_hooks.py should_theme_uri = {{env.base_path}}/deliverance/src/openplans_hooks/openplans_hooks.py links_config = {{env.base_path}}/etc/build.ini From novalis at codespeak.net Tue Nov 27 21:53:25 2007 From: novalis at codespeak.net (novalis at codespeak.net) Date: Tue, 27 Nov 2007 21:53:25 +0100 (CET) Subject: [z3-checkins] r49188 - in z3/deliverance/DeliveranceVHoster/trunk: . dvhoster Message-ID: <20071127205325.888F88171@code0.codespeak.net> Author: novalis Date: Tue Nov 27 21:53:24 2007 New Revision: 49188 Modified: z3/deliverance/DeliveranceVHoster/trunk/dvhoster/debuginterp.py z3/deliverance/DeliveranceVHoster/trunk/dvhoster/wsgiapp.py z3/deliverance/DeliveranceVHoster/trunk/setup.py Log: add authentication middleware Modified: z3/deliverance/DeliveranceVHoster/trunk/dvhoster/debuginterp.py ============================================================================== --- z3/deliverance/DeliveranceVHoster/trunk/dvhoster/debuginterp.py (original) +++ z3/deliverance/DeliveranceVHoster/trunk/dvhoster/debuginterp.py Tue Nov 27 21:53:24 2007 @@ -3,6 +3,7 @@ from paste.request import construct_url from dvhoster import current_environ import re +import warnings class Renderer(PyRenderer): Modified: z3/deliverance/DeliveranceVHoster/trunk/dvhoster/wsgiapp.py ============================================================================== --- z3/deliverance/DeliveranceVHoster/trunk/dvhoster/wsgiapp.py (original) +++ z3/deliverance/DeliveranceVHoster/trunk/dvhoster/wsgiapp.py Tue Nov 27 21:53:24 2007 @@ -9,11 +9,14 @@ from dvhoster.dispatcher import DeliveranceDispatcher from dvhoster.scrubber import EnvironScrubber +from eyvind.lib.authmiddleware import AuthenticationMiddleware + def make_app(global_conf, **app_conf): """Create a WSGI application and return it""" app = DeliveranceDispatcher(app_conf) app = HTTPExceptionHandler(app) app = RecursiveMiddleware(app) + app = AuthenticationMiddleware(app, app_conf) app = EnvironScrubber(app, app_conf) app = RegistryManager(app) debug = app_conf['debug'] = asbool(app_conf.get('debug', global_conf.get('debug'))) Modified: z3/deliverance/DeliveranceVHoster/trunk/setup.py ============================================================================== --- z3/deliverance/DeliveranceVHoster/trunk/setup.py (original) +++ z3/deliverance/DeliveranceVHoster/trunk/setup.py Tue Nov 27 21:53:24 2007 @@ -15,12 +15,14 @@ 'HTTPEncode', 'OHM==dev,>0.1', 'wsgi_intercept', - 'Transcluder' + 'Transcluder', + 'Eyvind' ], dependency_links=[ 'http://codespeak.net/svn/z3/deliverance/trunk#egg=Deliverance-dev', 'http://darcs.idyll.org/~t/projects/wsgi_intercept/wsgi_intercept.py#egg=wsgi_intercept-dev', - 'https://svn.openplans.org/svn/transcluder/trunk#egg=Transcluder-dev' + 'https://svn.openplans.org/svn/transcluder/trunk#egg=Transcluder-dev', + 'https://svn.openplans.org/svn/eyvind/trunk#egg=Eyvind-dev' ], packages=find_packages(), include_package_data=True, From z3-checkins at codespeak.net Sun Dec 2 18:00:12 2007 From: z3-checkins at codespeak.net (VIAGRA � Official Site) Date: Sun, 2 Dec 2007 18:00:12 +0100 (CET) Subject: [z3-checkins] November 79% OFF Message-ID: <20071202070016.6373.qmail@adsl-dyn203.91-127-78.t-com.sk> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20071202/89324bf0/attachment.htm From magicbronson at codespeak.net Mon Dec 3 22:34:03 2007 From: magicbronson at codespeak.net (magicbronson at codespeak.net) Date: Mon, 3 Dec 2007 22:34:03 +0100 (CET) Subject: [z3-checkins] r49326 - z3/deliverance/tags/0.1.1 Message-ID: <20071203213403.E660C8169@code0.codespeak.net> Author: magicbronson Date: Mon Dec 3 22:34:02 2007 New Revision: 49326 Added: z3/deliverance/tags/0.1.1/ - copied from r49325, z3/deliverance/trunk/ Log: cutting 0.1.1 tag From magicbronson at codespeak.net Mon Dec 3 22:34:56 2007 From: magicbronson at codespeak.net (magicbronson at codespeak.net) Date: Mon, 3 Dec 2007 22:34:56 +0100 (CET) Subject: [z3-checkins] r49327 - z3/deliverance/trunk Message-ID: <20071203213456.281758172@code0.codespeak.net> Author: magicbronson Date: Mon Dec 3 22:34:55 2007 New Revision: 49327 Modified: z3/deliverance/trunk/setup.py Log: bumping version to 0.1.2 post-0.1.1-tagging Modified: z3/deliverance/trunk/setup.py ============================================================================== --- z3/deliverance/trunk/setup.py (original) +++ z3/deliverance/trunk/setup.py Mon Dec 3 22:34:55 2007 @@ -1,4 +1,4 @@ -__version__ = '0.1.1' +__version__ = '0.1.2' from setuptools import setup, find_packages From reebalazs at codespeak.net Thu Dec 6 12:36:27 2007 From: reebalazs at codespeak.net (reebalazs at codespeak.net) Date: Thu, 6 Dec 2007 12:36:27 +0100 (CET) Subject: [z3-checkins] r49447 - z3/jsonserver/branch/merge/configfeature Message-ID: <20071206113627.490CE168530@codespeak.net> Author: reebalazs Date: Thu Dec 6 12:36:26 2007 New Revision: 49447 Modified: z3/jsonserver/branch/merge/configfeature/fiveconfig.py Log: Compensate import error zope.component.location occuring on Zope 3.4 Modified: z3/jsonserver/branch/merge/configfeature/fiveconfig.py ============================================================================== --- z3/jsonserver/branch/merge/configfeature/fiveconfig.py (original) +++ z3/jsonserver/branch/merge/configfeature/fiveconfig.py Thu Dec 6 12:36:26 2007 @@ -45,12 +45,14 @@ try: import zope.component.interface - import zope.component.location + # XXX this now fails on Zope 3.4, so + # commented out even if it gives bad result now + ##import zope.component.location __compat__.zope_pre_3_3 = False except ImportError: # The only supported pre_3_3 version is 3.2 import zope.app.component.interface - import zope.app.location + ##import zope.app.location __compat__.zope_pre_3_3 = True try: From ianb at codespeak.net Wed Dec 12 09:32:24 2007 From: ianb at codespeak.net (ianb at codespeak.net) Date: Wed, 12 Dec 2007 09:32:24 +0100 (CET) Subject: [z3-checkins] r49662 - z3/deliverance/DeliveranceVHoster/trunk Message-ID: <20071212083224.B84A0168440@codespeak.net> Author: ianb Date: Wed Dec 12 09:32:22 2007 New Revision: 49662 Modified: z3/deliverance/DeliveranceVHoster/trunk/fassembler_config.ini_tmpl Log: use env.var for hosts and logs Modified: z3/deliverance/DeliveranceVHoster/trunk/fassembler_config.ini_tmpl ============================================================================== --- z3/deliverance/DeliveranceVHoster/trunk/fassembler_config.ini_tmpl (original) +++ z3/deliverance/DeliveranceVHoster/trunk/fassembler_config.ini_tmpl Wed Dec 12 09:32:22 2007 @@ -14,7 +14,7 @@ [app:main] use = egg:DeliveranceVHoster -data_dir = {{env.base_path}}/var/deliverance/hosts +data_dir = {{env.var}}/deliverance/hosts #debug_headers = true # To view bodies: #debug_bodies = true @@ -33,7 +33,7 @@ # WARNING: *THE LINE BELOW MUST BE FALSE ON A PRODUCTION ENVIRONMENT* set debug = false -logger = {{env.base_path}}/logs/deliverance/dvhoster.log +logger = {{env.var}}/logs/deliverance/dvhoster.log init_domain = {{env.base_path}}/deliverance/src/openplans_hooks/openplans_hooks.py find_remote_uri = {{env.base_path}}/deliverance/src/openplans_hooks/openplans_hooks.py From z3-checkins at codespeak.net Thu Dec 13 17:31:19 2007 From: z3-checkins at codespeak.net (VIAGRA � Official Site) Date: Thu, 13 Dec 2007 17:31:19 +0100 (CET) Subject: [z3-checkins] December 70% OFF Message-ID: <20071213063129.20764.qmail@ip-62-143-202-8.1411N-CUD12K-02.ish.de> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20071213/e87f27ce/attachment.htm From z3-checkins at codespeak.net Mon Dec 17 05:03:05 2007 From: z3-checkins at codespeak.net (VIAGRA � Official Site) Date: Mon, 17 Dec 2007 05:03:05 +0100 (CET) Subject: [z3-checkins] Lovers package at discount price! Message-ID: <20071217-10651.12030.qmail@ppp-58.9.28.178.revip2.asianet.co.th> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20071217/a4ff71c6/attachment-0001.htm From z3-checkins at codespeak.net Sat Dec 29 10:55:12 2007 From: z3-checkins at codespeak.net (Doctor Alex Chen) Date: Sat, 29 Dec 2007 10:55:12 +0100 (CET) Subject: [z3-checkins] December 73% OFF Message-ID: <20071229135514.9647.qmail@complete.contents.volia.net> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20071229/b43c0388/attachment.htm