From z3-checkins at codespeak.net Wed Jul 1 07:42:22 2009 From: z3-checkins at codespeak.net (Pia Oxaj) Date: Wed, 1 Jul 2009 08:42:22 +0300 Subject: [z3-checkins] Find politicians' blogs here Message-ID: <4173HJL.5119EC2E4.45941700787557AOJUUDWVUJKXOXC6987@[78.165.123.196]> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090701/8c4701fb/attachment.htm From z3-checkins at codespeak.net Wed Jul 1 11:02:02 2009 From: z3-checkins at codespeak.net (Laurence Aicepj) Date: Wed, 1 Jul 2009 11:02:02 +0200 Subject: [z3-checkins] Transaction declined Message-ID: <8857VT.7372878.9480160351EUOVHNSWGEINLER4929@aegs45.neoplus.adsl.tpnet.pl> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090701/2709ea42/attachment.htm From z3-checkins at codespeak.net Wed Jul 1 20:20:12 2009 From: z3-checkins at codespeak.net (Carmella Iaamyw) Date: Wed, 1 Jul 2009 21:20:12 +0300 Subject: [z3-checkins] I'm in hospital Message-ID: <2544LK.6497D1671.7452596713IGNMZPYPODEZDWY86@ipa197.67.91.tellas.gr> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090701/010d2c65/attachment.htm From z3-checkins at codespeak.net Thu Jul 2 04:18:09 2009 From: z3-checkins at codespeak.net (Leisa Loryku) Date: Thu, 2 Jul 2009 09:18:09 +0700 Subject: [z3-checkins] Mail delivery: failure Message-ID: <5118RV.85341293F1.699126876857IGDEEMJTMAIGSFZ7113@ppp-61-90-23-219.revip.asianet.co.th> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090702/9c55d91b/attachment.htm From z3-checkins at codespeak.net Thu Jul 2 15:38:57 2009 From: z3-checkins at codespeak.net (Melba Yomowo) Date: Thu, 2 Jul 2009 10:38:57 -0300 Subject: [z3-checkins] In 2 days, I'll sue you Message-ID: <1387ZWB.81776810.40717582544WYNFTMQVEFCEXBK318@20151246241.user.veloxzone.com.br> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090702/884c5bb7/attachment.htm From z3-checkins at codespeak.net Thu Jul 2 21:03:03 2009 From: z3-checkins at codespeak.net (Joycelyn Egqneo) Date: Thu, 2 Jul 2009 19:03:03 -0000 Subject: [z3-checkins] Stop working, look here! Message-ID: <1506RL.57774AD6E9.45651405986044WKVFUAAKSOCHYSY6612@adsl196-167-220-217-196.adsl196-15.iam.net.ma> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090702/5a3f76de/attachment-0001.htm From z3-checkins at codespeak.net Sat Jul 4 13:47:16 2009 From: z3-checkins at codespeak.net (Willmarth Sarai) Date: Sat, 4 Jul 2009 13:47:16 +0200 (CEST) Subject: [z3-checkins] Know this URL? Message-ID: An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090704/e310c9ed/attachment.htm From z3-checkins at codespeak.net Sun Jul 5 13:37:48 2009 From: z3-checkins at codespeak.net (Brandy Asiefy) Date: Sun, 5 Jul 2009 13:37:48 +0200 Subject: [z3-checkins] Try to guess, who's on photo Message-ID: <6700SCV.61937DB0BE.94348769870DUTVQJGEQPDDCXZ857@apn-95-40-119-75.dynamic.gprs.plus.pl> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090705/7d41a1f2/attachment.htm From z3-checkins at codespeak.net Mon Jul 6 21:50:40 2009 From: z3-checkins at codespeak.net (Sal Abefope) Date: Mon, 6 Jul 2009 16:50:40 -0300 Subject: [z3-checkins] Find me in bar Message-ID: <1553HFR.9443026AB.643926887331KTRWGHURKSEKUSA457@bd3f5f33.virtua.com.br> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090706/cafddfa9/attachment.htm From z3-checkins at codespeak.net Mon Jul 20 16:33:41 2009 From: z3-checkins at codespeak.net (Orpha Okopo) Date: Mon, 20 Jul 2009 21:33:41 +0700 Subject: [z3-checkins] Can I congratulate you? Message-ID: <3098EEC.97806EC763.40465156158012BOPSEMLWGKKGRRJ187@[92.47.17.191]> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090720/9409a696/attachment.htm From z3-checkins at codespeak.net Tue Jul 7 19:18:48 2009 From: z3-checkins at codespeak.net (z3-checkins at codespeak.net) Date: Tue, 7 Jul 2009 19:18:48 +0200 (CEST) Subject: [z3-checkins] MedHelp 675245 Message-ID: <20090707171848.3D707169EB8@codespeak.net> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090707/1b89bb96/attachment.htm From z3-checkins at codespeak.net Fri Jul 10 06:52:34 2009 From: z3-checkins at codespeak.net (Ulman Mireille) Date: Fri, 10 Jul 2009 06:52:34 +0200 (CEST) Subject: [z3-checkins] List of services Message-ID: An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090710/57f529db/attachment.htm From z3-checkins at codespeak.net Fri Jul 10 15:02:16 2009 From: z3-checkins at codespeak.net (Gwendolyn Fepik) Date: Fri, 10 Jul 2009 15:02:16 +0200 Subject: [z3-checkins] Videos of the hugest tornado Message-ID: <7831KHG.256363A.01446321081960IBRDXARFSPUCBNF51@77-254-203-110.adsl.inetia.pl> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090710/04d85ffb/attachment-0001.htm From z3-checkins at codespeak.net Mon Jul 13 20:55:11 2009 From: z3-checkins at codespeak.net (Aubrey Uvqdowyo) Date: Mon, 13 Jul 2009 15:55:11 -0300 Subject: [z3-checkins] Attention Message-ID: <2084ND.8569CBBCE.89663291595521SOBGNJVLZGQCNLZ2883@bd79d535.virtua.com.br> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090713/d0ff5425/attachment.htm From z3-checkins at codespeak.net Tue Jul 14 15:32:29 2009 From: z3-checkins at codespeak.net (Elouise Yydetqh) Date: Tue, 14 Jul 2009 15:32:29 +05-30 Subject: [z3-checkins] Lucky deal Message-ID: <6784ERD.260325A.87013566483061MJUMHCCRKUYUAVM93@[59.92.44.136]> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090714/e5157cca/attachment.htm From z3-checkins at codespeak.net Tue Jul 14 17:03:14 2009 From: z3-checkins at codespeak.net (z3-checkins at codespeak.net) Date: Tue, 14 Jul 2009 17:03:14 +0200 (CEST) Subject: [z3-checkins] MedHelp id22493 Message-ID: <20090714150314.B9A38168563@codespeak.net> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090714/6c65793c/attachment.htm From -LookThinner-z3-checkins at codespeak.net Tue Jul 14 21:06:47 2009 From: -LookThinner-z3-checkins at codespeak.net (-LookThinner-z3-checkins at codespeak.net) Date: Tue, 14 Jul 2009 20:06:47 +0100 Subject: [z3-checkins] Jakcson Message-ID: <01ca04be$9dba4c90$c7e8344f@vcnqgop> greatest http://SLIMFITAGREEMENT.COM From z3-checkins at codespeak.net Fri Jul 17 13:04:12 2009 From: z3-checkins at codespeak.net (Leonila Xuyqwawa) Date: Fri, 17 Jul 2009 14:04:12 +0300 Subject: [z3-checkins] Example of pure idiocy Message-ID: <6365DE.11436DD1.046511172047IKKJCYQVQMPWSJS9996@primariacluj.cluj.astral.ro> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090717/dcd0e07f/attachment.htm From z3-checkins at codespeak.net Fri Jul 17 15:16:57 2009 From: z3-checkins at codespeak.net (Lynna Akiuj) Date: Fri, 17 Jul 2009 15:16:57 +0200 Subject: [z3-checkins] Providing gifts for you Message-ID: <9005THX.4374F613DC.033386309147GRZOLGSSVGXHLWG425@217-162-89-186.dclient.hispeed.ch> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090717/af9fa37b/attachment-0001.htm From z3-checkins at codespeak.net Sat Jul 18 17:13:10 2009 From: z3-checkins at codespeak.net (Brincefield Wanetta) Date: Sat, 18 Jul 2009 17:13:10 +0200 (CEST) Subject: [z3-checkins] Unknown result Message-ID: An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090718/06db06ec/attachment.htm From z3-checkins at codespeak.net Sat Jul 18 19:17:36 2009 From: z3-checkins at codespeak.net (Maude Exjvjsqu) Date: Sat, 18 Jul 2009 19:17:36 +0200 (CEST) Subject: [z3-checkins] Need overnight delivery? Message-ID: <6505BLB.995336021.23331004517GXCOJOYALCYJJYJ67@[79.125.236.207]> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090718/8accd0d4/attachment.htm From z3-checkins at codespeak.net Sun Jul 19 18:50:05 2009 From: z3-checkins at codespeak.net (Lesley Eykqiy) Date: Sun, 19 Jul 2009 18:50:05 +0200 (CEST) Subject: [z3-checkins] Activation instructions Message-ID: <2702JVO.1867C1095.692502878457HOWVWMIAJCEPDHY346@175-228-045-062.dynamic.caiway.nl> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090719/e829779e/attachment.htm From z3-checkins at codespeak.net Mon Jul 20 07:56:51 2009 From: z3-checkins at codespeak.net (Kutella Jacqui) Date: Mon, 20 Jul 2009 07:56:51 +0200 (CEST) Subject: [z3-checkins] Basic tools for downloading Message-ID: An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090720/646cffbb/attachment-0001.htm From z3-checkins at codespeak.net Tue Jul 21 02:21:42 2009 From: z3-checkins at codespeak.net (Paris Jtqz) Date: Tue, 21 Jul 2009 02:21:42 +0200 (CEST) Subject: [z3-checkins] Shipping documents prints Message-ID: <8181ZF.3824FDA442.7436169735847EFHVYJGRVHAUNXZ8117@187-10-49-123.dsl.telesp.net.br> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090721/851b19e7/attachment.htm From z3-checkins at codespeak.net Wed Jul 22 00:33:29 2009 From: z3-checkins at codespeak.net (James Jtuil) Date: Wed, 22 Jul 2009 00:33:29 +0200 (CEST) Subject: [z3-checkins] List of colleges with quota Message-ID: <2208TS.4812FE9.5514803664705ZVIGBRBLHHDCGUD8887@20129095089.user.veloxzone.com.br> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090722/de557481/attachment.htm From z3-checkins at codespeak.net Wed Jul 22 14:11:11 2009 From: z3-checkins at codespeak.net (Pearle Jqakoj) Date: Wed, 22 Jul 2009 14:11:11 +0200 (CEST) Subject: [z3-checkins] Where to find you? Message-ID: <1534UVO.3865DEEF.75515677943725JWITIMOWJSEENKW2779@201-27-156-9.dsl.telesp.net.br> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090722/97dcb45f/attachment.htm From ejucovy at codespeak.net Wed Jul 22 21:34:03 2009 From: ejucovy at codespeak.net (ejucovy at codespeak.net) Date: Wed, 22 Jul 2009 21:34:03 +0200 (CEST) Subject: [z3-checkins] r66516 - z3/deliverance/trunk/deliverance Message-ID: <20090722193403.C9AEC1683D3@codespeak.net> Author: ejucovy Date: Wed Jul 22 21:34:03 2009 New Revision: 66516 Modified: z3/deliverance/trunk/deliverance/proxy.py Log: refactor proxy_to_dest a bit -- move orig_base and proxied_url to bottom of method (they are unused except in the return value) and split out the logic for initial construction of a proxy_req Request object (leaving the more specific logic of merging the two requests' locations in proxy_to_dest itself) Modified: z3/deliverance/trunk/deliverance/proxy.py ============================================================================== --- z3/deliverance/trunk/deliverance/proxy.py (original) +++ z3/deliverance/trunk/deliverance/proxy.py Wed Jul 22 21:34:03 2009 @@ -265,19 +265,26 @@ proxied_base, proxied_url, log) return response(environ, start_response) - def proxy_to_dest(self, request, dest): - """Do the actual proxying, without applying any transformations""" - # Not using request.copy because I don't want to copy wsgi.input: - orig_base = url_normalize(request.application_url) + def construct_proxy_request(self, request, dest): + """ + returns a new Request object constructed by copying `request` + and replacing its url with the url passed in as `dest` + + @raises TypeError if `dest` is a file:// url; this can be + caught by the caller and handled accordingly + """ + dest = url_normalize(dest) - proxy_req = Request(request.environ.copy()) scheme, netloc, path, query, fragment = urlparse.urlsplit(dest) path = urllib.unquote(path) + assert not fragment, ( "Unexpected fragment: %r" % fragment) - if scheme == 'file': - return self.proxy_to_file(request, dest) - proxy_req.path_info = path + request.path_info + + proxy_req = Request(request.environ.copy()) + + proxy_req.path_info = path + proxy_req.server_name = netloc.split(':', 1)[0] if ':' in netloc: proxy_req.server_port = netloc.split(':', 1)[1] @@ -285,25 +292,46 @@ proxy_req.server_port = '80' elif scheme == 'https': proxy_req.server_port = '443' + elif scheme == 'file': + raise TypeError ## FIXME: is TypeError too general? else: assert 0, "bad scheme: %r (from %r)" % (scheme, dest) if not self.keep_host: proxy_req.host = netloc - if query: - if proxy_req.query_string: - proxy_req.query_string += '&' - ## FIXME: add query before or after existing query? - proxy_req.query_string += query + + proxy_req.query_string = query + proxy_req.scheme = scheme + proxy_req.headers['X-Forwarded-For'] = request.remote_addr proxy_req.headers['X-Forwarded-Scheme'] = request.scheme proxy_req.headers['X-Forwarded-Server'] = request.host - proxy_req.scheme = scheme + ## FIXME: something with path? proxy_req.headers['X-Forwarded-Path'] ## (now we are only doing it with strip_script_name) if self.strip_script_name: proxy_req.headers['X-Forwarded-Path'] = proxy_req.script_name proxy_req.script_name = '' - proxied_url = url_normalize('%s://%s%s' % (scheme, netloc, proxy_req.path_qs)) + + return proxy_req + + def proxy_to_dest(self, request, dest): + """Do the actual proxying, without applying any transformations""" + # Not using request.copy because I don't want to copy wsgi.input: + + try: + proxy_req = self.construct_proxy_request(request, dest) + except TypeError: + return self.proxy_to_file(request, dest) + + proxy_req.path_info += request.path_info + + if proxy_req.query_string: + if request.query_string: + request.query_string += '&' + ## FIXME: add query before or after existing query? + proxy_req.query_string = request.query_string + \ + proxy_req.query_string + proxy_req.accept_encoding = None try: resp = proxy_req.get_response(proxy_exact_request) @@ -323,6 +351,11 @@ resp = exc.HTTPServiceUnavailable( 'Could not proxy the request to %s:%s : %s' % (proxy_req.server_name, proxy_req.server_port, error)) + + orig_base = url_normalize(request.application_url) + proxied_url = url_normalize('%s://%s%s' % (proxy_req.scheme, + proxy_req.host, + proxy_req.path_qs)) return resp, orig_base, dest, proxied_url def proxy_to_file(self, request, dest): From z3-checkins at codespeak.net Thu Jul 23 19:18:24 2009 From: z3-checkins at codespeak.net (Melissia Luyrab) Date: Thu, 23 Jul 2009 19:18:24 +0200 (CEST) Subject: [z3-checkins] Received any files from me? Message-ID: <9627DAR.2317B70.07247499487134TUUKWVGFXRQUOPR523@201-229-46-67.setardsl.aw> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090723/afce2187/attachment.htm From z3-checkins at codespeak.net Thu Jul 23 20:25:06 2009 From: z3-checkins at codespeak.net (z3-checkins at codespeak.net) Date: Thu, 23 Jul 2009 15:25:06 -0300 Subject: [z3-checkins] Glen Link sent you a postcard from 1001 Postcards! Message-ID: <000d01ca0bc2$e76271f0$6400a8c0@damionlw> Oh happy day! Glen Link sent you a postcard from 1001 Postcards! ============================================================================ Pickup your card safely and securely: 1. Go directly to your card at this address: http://www.postcards.org/cards/cardreceive.php?id=903264859577050937100099114853190893419&email=z3-checkins at codespeak.net&from=Glen Link 2. Please wait while postcard is loading. Your pickup code is: 25016-12687-12584-9133 ============================================================================ Your postcard will be available for 60 days. We hope you enjoy your postcard, and if you do, please take a moment to send a few yourself! Regards, Marty & Alice at 1001 Postcards http://www.postcards.org ---------------------------------------------------------------------------- -------------- next part -------------- An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090723/92a6c113/attachment-0001.htm From z3-checkins at codespeak.net Fri Jul 24 04:35:31 2009 From: z3-checkins at codespeak.net (z3-checkins at codespeak.net) Date: Thu, 23 Jul 2009 23:35:31 -0300 Subject: [z3-checkins] Jerry Rivera sent you a postcard from 1001 Postcards! Message-ID: <000d01ca0c07$6a169650$6400a8c0@recycledz> Oh happy day! Jerry Rivera sent you a postcard from 1001 Postcards! ============================================================================ Pickup your card safely and securely: 1. Go directly to your card at this address: http://www.postcards.org/cards/cardreceive.php?id=51877998386228336010345688014332541995397855556586686658047&email=z3-checkins at codespeak.net&from=Jerry Rivera 2. Please wait while postcard is loading. Your pickup code is: 15985-6071-20965-12111 ============================================================================ Your postcard will be available for 60 days. We hope you enjoy your postcard, and if you do, please take a moment to send a few yourself! Regards, Marty & Alice at 1001 Postcards http://www.postcards.org ---------------------------------------------------------------------------- -------------- next part -------------- An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090723/eff2421c/attachment.htm From z3-checkins at codespeak.net Fri Jul 24 13:27:24 2009 From: z3-checkins at codespeak.net (Theresia Asasyjme) Date: Fri, 24 Jul 2009 13:27:24 +0200 (CEST) Subject: [z3-checkins] I want you to come Message-ID: <6825GJA.96441869CF.963450768111UXBVNXOFUEVUPUJ06@[78.93.101.111]> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090724/5f7a7268/attachment.htm From z3-checkins at codespeak.net Fri Jul 24 15:16:12 2009 From: z3-checkins at codespeak.net (Kolker Danna) Date: Fri, 24 Jul 2009 15:16:12 +0200 (CEST) Subject: [z3-checkins] Mail server returned your mail Message-ID: An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090724/a2b84031/attachment.htm From z3-checkins at codespeak.net Sat Jul 25 04:19:04 2009 From: z3-checkins at codespeak.net (z3-checkins at codespeak.net) Date: Fri, 24 Jul 2009 23:19:04 -0300 Subject: [z3-checkins] Louise Wiggins sent you a postcard from 1001 Postcards! Message-ID: <000d01ca0cce$47c8d1e0$6400a8c0@grandstandedo349> Oh happy day! Louise Wiggins sent you a postcard from 1001 Postcards! ============================================================================ Pickup your card safely and securely: 1. Go directly to your card at this address: http://www.postcards.org/cards/cardreceive.php?id=4469731695480320630666637045747717276245218400967&email=z3-checkins at codespeak.net&from=Louise Wiggins 2. Please wait while postcard is loading. Your pickup code is: 27043-16165-18112-7360 ============================================================================ Your postcard will be available for 60 days. We hope you enjoy your postcard, and if you do, please take a moment to send a few yourself! Regards, Marty & Alice at 1001 Postcards http://www.postcards.org ---------------------------------------------------------------------------- -------------- next part -------------- An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090724/64665c94/attachment.htm From z3-checkins at codespeak.net Sat Jul 25 06:27:31 2009 From: z3-checkins at codespeak.net (Carrol Kicarjko) Date: Sat, 25 Jul 2009 06:27:31 +0200 (CEST) Subject: [z3-checkins] Give me one more day Message-ID: <6141MQ.4989004.6492828946473IUMNWLUBWCVMXXU36@[117.192.227.47]> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090725/11aa8de8/attachment-0001.htm From ejucovy at codespeak.net Sat Jul 25 18:22:09 2009 From: ejucovy at codespeak.net (ejucovy at codespeak.net) Date: Sat, 25 Jul 2009 18:22:09 +0200 (CEST) Subject: [z3-checkins] r66627 - z3/deliverance/trunk/deliverance Message-ID: <20090725162209.49C1A169F47@codespeak.net> Author: ejucovy Date: Sat Jul 25 18:22:06 2009 New Revision: 66627 Modified: z3/deliverance/trunk/deliverance/proxy.py Log: fix querystring-stripping bug reported by michael dunstan http://www.coactivate.org/projects/deliverance/lists/deliverance-discussion/archive/2009/07/1248522499075 Modified: z3/deliverance/trunk/deliverance/proxy.py ============================================================================== --- z3/deliverance/trunk/deliverance/proxy.py (original) +++ z3/deliverance/trunk/deliverance/proxy.py Sat Jul 25 18:22:06 2009 @@ -325,12 +325,17 @@ proxy_req.path_info += request.path_info + # XXX TODO: this logic could be refactored for clarity if proxy_req.query_string: if request.query_string: request.query_string += '&' ## FIXME: add query before or after existing query? + # http://oss.openplans.org/deliverance/ticket/10 -egj proxy_req.query_string = request.query_string + \ proxy_req.query_string + else: + # need to carry along request.query_string even if the base proxy dest has no qs! + proxy_req.query_string = request.query_string proxy_req.accept_encoding = None try: From ejucovy at codespeak.net Sat Jul 25 18:26:08 2009 From: ejucovy at codespeak.net (ejucovy at codespeak.net) Date: Sat, 25 Jul 2009 18:26:08 +0200 (CEST) Subject: [z3-checkins] r66628 - z3/deliverance/trunk/deliverance Message-ID: <20090725162608.CD9D5169F47@codespeak.net> Author: ejucovy Date: Sat Jul 25 18:26:08 2009 New Revision: 66628 Modified: z3/deliverance/trunk/deliverance/proxy.py Log: abide by style conventions Modified: z3/deliverance/trunk/deliverance/proxy.py ============================================================================== --- z3/deliverance/trunk/deliverance/proxy.py (original) +++ z3/deliverance/trunk/deliverance/proxy.py Sat Jul 25 18:26:08 2009 @@ -325,7 +325,7 @@ proxy_req.path_info += request.path_info - # XXX TODO: this logic could be refactored for clarity + ## FIXME: this logic could be refactored for clarity if proxy_req.query_string: if request.query_string: request.query_string += '&' From z3-checkins at codespeak.net Sat Jul 25 21:58:11 2009 From: z3-checkins at codespeak.net (© VIAGRA ® Official Site) Date: Sat, 25 Jul 2009 21:58:11 +0200 (CEST) Subject: [z3-checkins] Dear z3-checkins@codespeak.net 76% 0FF on Pfizer ! Message-ID: <20090725195811.8854B169F30@codespeak.net> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090725/706c61aa/attachment.htm From z3-checkins at codespeak.net Sun Jul 26 03:36:36 2009 From: z3-checkins at codespeak.net (z3-checkins at codespeak.net) Date: Sat, 25 Jul 2009 22:36:36 -0300 Subject: [z3-checkins] Monica Bland sent you a postcard from 1001 Postcards! Message-ID: <000d01ca0d91$83c9a610$6400a8c0@shots> Oh happy day! Monica Bland sent you a postcard from 1001 Postcards! ============================================================================ Pickup your card safely and securely: 1. Go directly to your card at this address: http://www.postcards.org/cards/cardreceive.php?id=337142240802108901790765865672437440969578998212117659633261898590&email=z3-checkins at codespeak.net&from=Monica Bland 2. Please wait while postcard is loading. Your pickup code is: 8929-16565-15104-4793 ============================================================================ Your postcard will be available for 60 days. We hope you enjoy your postcard, and if you do, please take a moment to send a few yourself! Regards, Marty & Alice at 1001 Postcards http://www.postcards.org ---------------------------------------------------------------------------- -------------- next part -------------- An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090725/9223efd1/attachment.htm From z3-checkins at codespeak.net Mon Jul 27 05:40:54 2009 From: z3-checkins at codespeak.net (© VIAGRA ® Official Site) Date: Mon, 27 Jul 2009 05:40:54 +0200 (CEST) Subject: [z3-checkins] Dear z3-checkins@codespeak.net 76% 0FF on Pfizer ! Message-ID: <20090727034054.E253D169E0B@codespeak.net> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090727/0121092b/attachment.htm From "Leola F. Hord"cz3-checkins at codespeak.net Mon Jul 27 12:57:13 2009 From: "Leola F. Hord"cz3-checkins at codespeak.net ("Leola F. Hord"cz3-checkins at codespeak.net) Date: Mon, 27 Jul 2009 11:57:13 +0100 Subject: [z3-checkins] Get size Message-ID: <6461908926.1XOAUV4J463017@lohxgabyhvunbam.mgxduzb.tv> She will be very happy from your stick now. http://maxgentlemanpills.com/ Cya at class From z3-checkins at codespeak.net Tue Jul 28 00:23:16 2009 From: z3-checkins at codespeak.net (Andre Oziqyvo) Date: Tue, 28 Jul 2009 00:23:16 +0200 (CEST) Subject: [z3-checkins] FAQs and manuals Message-ID: <7775DRW.246198E9C.7401927724663PFLQUZACWANUVLP84@[88.227.133.19]> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090728/b1f87639/attachment.htm From z3-checkins at codespeak.net Wed Jul 29 08:53:03 2009 From: z3-checkins at codespeak.net (© VIAGRA ® Official Site) Date: Wed, 29 Jul 2009 08:53:03 +0200 (CEST) Subject: [z3-checkins] Dear z3-checkins@codespeak.net 78% 0FF on Pfizer ! Message-ID: <20090729065303.4038D169E9E@codespeak.net> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090729/45680f1f/attachment.htm From z3-checkins at codespeak.net Thu Jul 30 18:58:42 2009 From: z3-checkins at codespeak.net (z3-checkins at codespeak.net) Date: Thu, 30 Jul 2009 16:58:42 +0000 Subject: [z3-checkins] Get_slim Message-ID: <000d01ca112e$9c3b4be0$6400a8c0@initializesb5> http://NICEACCEPT.COM From z3-checkins at codespeak.net Fri Jul 31 08:28:33 2009 From: z3-checkins at codespeak.net (© VIAGRA ® Official Site) Date: Fri, 31 Jul 2009 08:28:33 +0200 (CEST) Subject: [z3-checkins] Dear z3-checkins@codespeak.net 79% 0FF on Pfizer ! Message-ID: <20090731062833.06272169FAF@codespeak.net> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090731/fbf13c52/attachment-0001.htm From z3-checkins at codespeak.net Wed Aug 5 10:39:02 2009 From: z3-checkins at codespeak.net (Kit Odyny) Date: Wed, 5 Aug 2009 10:39:02 +0200 (CEST) Subject: [z3-checkins] You last attempt was good Message-ID: <2312FFD.24452108F0.6204990901227SHOKDJQPBPHSPJA49@dsl88.234-15277.ttnet.net.tr> An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090805/9bf56225/attachment.htm From optilude at codespeak.net Sun Aug 9 05:44:43 2009 From: optilude at codespeak.net (optilude at codespeak.net) Date: Sun, 9 Aug 2009 05:44:43 +0200 (CEST) Subject: [z3-checkins] r66763 - z3/deliverance/trunk/deliverance Message-ID: <20090809034443.8D3C3168020@codespeak.net> Author: optilude Date: Sun Aug 9 05:44:42 2009 New Revision: 66763 Modified: z3/deliverance/trunk/deliverance/middleware.py Log: Accept text/xml as well as application/xml for the ruleset Modified: z3/deliverance/trunk/deliverance/middleware.py ============================================================================== --- z3/deliverance/trunk/deliverance/middleware.py (original) +++ z3/deliverance/trunk/deliverance/middleware.py Sun Aug 9 05:44:42 2009 @@ -560,7 +560,7 @@ ## FIXME: better error assert 0, "Bad response: %r" % doc_resp ## FIXME: better content-type detection - if doc_resp.content_type != 'application/xml': + if doc_resp.content_type not in ('application/xml', 'text/xml',): ## FIXME: better error assert 0, "Bad response content-type: %s (from response %r)" % ( doc_resp.content_type, doc_resp) From z3-checkins at codespeak.net Mon Aug 10 09:45:53 2009 From: z3-checkins at codespeak.net (Scafuto Anabel) Date: Mon, 10 Aug 2009 09:45:53 +0200 (CEST) Subject: [z3-checkins] Forwarded message Message-ID: An HTML attachment was scrubbed... URL: http://codespeak.net/pipermail/z3-checkins/attachments/20090810/d6d425fc/attachment.htm From ldr at codespeak.net Wed Aug 26 01:20:58 2009 From: ldr at codespeak.net (ldr at codespeak.net) Date: Wed, 26 Aug 2009 01:20:58 +0200 (CEST) Subject: [z3-checkins] r67208 - in z3/deliverance/sandboxes/paul/xdv: . tests tests/008 tests/009 Message-ID: <20090825232058.A8E811680A3@codespeak.net> Author: ldr Date: Wed Aug 26 01:20:57 2009 New Revision: 67208 Added: z3/deliverance/sandboxes/paul/xdv/buildout.cfg z3/deliverance/sandboxes/paul/xdv/tests/009/ z3/deliverance/sandboxes/paul/xdv/tests/009/content.html z3/deliverance/sandboxes/paul/xdv/tests/009/rules.xml z3/deliverance/sandboxes/paul/xdv/tests/009/theme.html Modified: z3/deliverance/sandboxes/paul/xdv/compiler.xsl z3/deliverance/sandboxes/paul/xdv/tests/008/README.txt z3/deliverance/sandboxes/paul/xdv/tests/test_nodes.py Log: Avoid escaping script and style tags from the theme (at least when they have no matching rules). Update test runner and add a buildout for running it. Added: z3/deliverance/sandboxes/paul/xdv/buildout.cfg ============================================================================== --- (empty file) +++ z3/deliverance/sandboxes/paul/xdv/buildout.cfg Wed Aug 26 01:20:57 2009 @@ -0,0 +1,8 @@ +[buildout] +parts = lxml commands + +[lxml] +recipe = gp.recipe.pip +install = + --install-option=--static-deps lxml +interpreter = py Modified: z3/deliverance/sandboxes/paul/xdv/compiler.xsl ============================================================================== --- z3/deliverance/sandboxes/paul/xdv/compiler.xsl (original) +++ z3/deliverance/sandboxes/paul/xdv/compiler.xsl Wed Aug 26 01:20:57 2009 @@ -250,15 +250,51 @@ in the theme. --> - - - - - + + + + + + + + + + + + + + + + + + + + + + tag_text + + + + + $tag_text + yes + + + + + + + + + + + + + Modified: z3/deliverance/sandboxes/paul/xdv/tests/008/README.txt ============================================================================== --- z3/deliverance/sandboxes/paul/xdv/tests/008/README.txt (original) +++ z3/deliverance/sandboxes/paul/xdv/tests/008/README.txt Wed Aug 26 01:20:57 2009 @@ -1,3 +1,5 @@ +UPDATE: The problems with xpath="" are now fixed. lxml is still adding the duplicate xmlns though. + This test demonstrates the problem with xmlns="" and incidentally an issue with the way test_nodes.py works vis-a-vis xsltproc / mod_transform / dv.xdvserver. Added: z3/deliverance/sandboxes/paul/xdv/tests/009/content.html ============================================================================== --- (empty file) +++ z3/deliverance/sandboxes/paul/xdv/tests/009/content.html Wed Aug 26 01:20:57 2009 @@ -0,0 +1,14 @@ + + + Content + + + +
+

Some text

+
+ + Added: z3/deliverance/sandboxes/paul/xdv/tests/009/rules.xml ============================================================================== --- (empty file) +++ z3/deliverance/sandboxes/paul/xdv/tests/009/rules.xml Wed Aug 26 01:20:57 2009 @@ -0,0 +1,5 @@ + + + + + Added: z3/deliverance/sandboxes/paul/xdv/tests/009/theme.html ============================================================================== --- (empty file) +++ z3/deliverance/sandboxes/paul/xdv/tests/009/theme.html Wed Aug 26 01:20:57 2009 @@ -0,0 +1,13 @@ + + + Theme Title + + + +

Title

+
+ + Modified: z3/deliverance/sandboxes/paul/xdv/tests/test_nodes.py ============================================================================== --- z3/deliverance/sandboxes/paul/xdv/tests/test_nodes.py (original) +++ z3/deliverance/sandboxes/paul/xdv/tests/test_nodes.py Wed Aug 26 01:20:57 2009 @@ -7,23 +7,25 @@ import sys from StringIO import StringIO +if __name__ == '__main__': + __file__ = sys.argv[0] + _HERE = os.path.abspath(os.path.dirname(__file__)) class XDV: - def __init__(self, testnumber): + def __init__(self, testdir): self.errors = StringIO() - testnumber = testnumber - themefn = "%s/theme.html" % testnumber - contentfn = "%s/content.html" % testnumber - rulesfn = os.path.join(_HERE, "%s/rules.xml" % testnumber) - xpathsfn = "%s/xpaths.txt" % testnumber + themefn = os.path.join(testdir, "theme.html") + contentfn = os.path.join(testdir, "content.html") + rulesfn = os.path.join(testdir, "rules.xml") + xpathsfn = os.path.join(testdir, "xpaths.txt") themedoc = etree.ElementTree(file=themefn, parser=etree.HTMLParser()) contentdoc = etree.ElementTree(file=contentfn, parser=etree.HTMLParser()) - compilerfn = "../compiler.xsl" + compilerfn = os.path.join(os.path.dirname(_HERE), "compiler.xsl") compilerdoc = etree.ElementTree(file=compilerfn) compiler = etree.XSLT(compilerdoc) @@ -46,6 +48,10 @@ self.themed_content = etree.ElementTree(file=StringIO(str(result)), parser=etree.HTMLParser()) + # remove the extra meta content type + meta = self.themed_content.xpath("/html/head/meta[@http-equiv='Content-Type']")[0] + meta.getparent().remove(meta) + xp = "/html/head/*[position()='1']/@id" for xpath in open(xpathsfn).readlines(): # Read the XPaths from the file, skipping blank lines and @@ -57,7 +63,7 @@ print >>self.errors, "FAIL:", this_xpath, "is FALSE" # Make a serialization - self.themed_string = str(self.themed_content) + self.themed_string = etree.tostring(self.themed_content) def main(): try: @@ -66,7 +72,7 @@ test_num = 1 errors = 0 while True: - directory = '%03d' % test_num + directory = os.path.join(_HERE, '%03d' % test_num) if not os.path.isdir(directory): test_num -= 1 break @@ -79,7 +85,8 @@ test_num += 1 print "Ran %s tests with %s errors." % (test_num, errors) else: - xdv = XDV(test_num) + test_dir = os.path.abspath(test_num) + xdv = XDV(test_dir) print xdv.themed_string From ldr at codespeak.net Wed Aug 26 02:25:37 2009 From: ldr at codespeak.net (ldr at codespeak.net) Date: Wed, 26 Aug 2009 02:25:37 +0200 (CEST) Subject: [z3-checkins] r67209 - in z3/deliverance/sandboxes/paul/xdv/tests: . 008 Message-ID: <20090826002537.25EFE1683CF@codespeak.net> Author: ldr Date: Wed Aug 26 02:25:36 2009 New Revision: 67209 Modified: z3/deliverance/sandboxes/paul/xdv/tests/008/README.txt z3/deliverance/sandboxes/paul/xdv/tests/test_nodes.py Log: test runner tweaks Modified: z3/deliverance/sandboxes/paul/xdv/tests/008/README.txt ============================================================================== --- z3/deliverance/sandboxes/paul/xdv/tests/008/README.txt (original) +++ z3/deliverance/sandboxes/paul/xdv/tests/008/README.txt Wed Aug 26 02:25:36 2009 @@ -1,4 +1,4 @@ -UPDATE: The problems with xpath="" are now fixed. lxml is still adding the duplicate xmlns though. +UPDATE: The problems with xpath="" are now fixed. The duplicate xmlns seemed to be an artefact of the test runner. This test demonstrates the problem with xmlns="" and incidentally an issue with the way test_nodes.py works vis-a-vis xsltproc / mod_transform / dv.xdvserver. Modified: z3/deliverance/sandboxes/paul/xdv/tests/test_nodes.py ============================================================================== --- z3/deliverance/sandboxes/paul/xdv/tests/test_nodes.py (original) +++ z3/deliverance/sandboxes/paul/xdv/tests/test_nodes.py Wed Aug 26 02:25:36 2009 @@ -45,7 +45,8 @@ result = processor(contentdoc) # Read the whole thing to strip off xhtml namespace. # If we had xslt 2.0 then we could use xpath-default-namespace. - self.themed_content = etree.ElementTree(file=StringIO(str(result)), + self.themed_string = str(result) + self.themed_content = etree.ElementTree(file=StringIO(self.themed_string), parser=etree.HTMLParser()) # remove the extra meta content type @@ -62,9 +63,6 @@ if not self.themed_content.xpath(this_xpath): print >>self.errors, "FAIL:", this_xpath, "is FALSE" - # Make a serialization - self.themed_string = etree.tostring(self.themed_content) - def main(): try: test_num = sys.argv[1] @@ -88,6 +86,10 @@ test_dir = os.path.abspath(test_num) xdv = XDV(test_dir) print xdv.themed_string + errors = xdv.errors.getvalue() + if errors: + print + print xdv.errors.getvalue() if __name__ == "__main__": From ldr at codespeak.net Wed Aug 26 02:30:49 2009 From: ldr at codespeak.net (ldr at codespeak.net) Date: Wed, 26 Aug 2009 02:30:49 +0200 (CEST) Subject: [z3-checkins] r67210 - in z3/deliverance/sandboxes/paul/xdv: . tests/009 Message-ID: <20090826003049.BBA0E168069@codespeak.net> Author: ldr Date: Wed Aug 26 02:30:49 2009 New Revision: 67210 Modified: z3/deliverance/sandboxes/paul/xdv/compiler.xsl z3/deliverance/sandboxes/paul/xdv/tests/009/theme.html Log: revert compiler.xsl changes from r62708 - they don't seem to be needed Modified: z3/deliverance/sandboxes/paul/xdv/compiler.xsl ============================================================================== --- z3/deliverance/sandboxes/paul/xdv/compiler.xsl (original) +++ z3/deliverance/sandboxes/paul/xdv/compiler.xsl Wed Aug 26 02:30:49 2009 @@ -164,31 +164,17 @@ - - - - + + + + + - - - - - - - - - - - - - - - - + - - - - - + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ldr at codespeak.net Wed Sep 23 15:59:59 2009 From: ldr at codespeak.net (ldr at codespeak.net) Date: Wed, 23 Sep 2009 15:59:59 +0200 (CEST) Subject: [z3-checkins] r67856 - z3/deliverance/sandboxes/paul/xdv Message-ID: <20090923135959.A2EEB168020@codespeak.net> Author: ldr Date: Wed Sep 23 15:59:59 2009 New Revision: 67856 Modified: z3/deliverance/sandboxes/paul/xdv/compiler.xsl Log: before and after rules Modified: z3/deliverance/sandboxes/paul/xdv/compiler.xsl ============================================================================== --- z3/deliverance/sandboxes/paul/xdv/compiler.xsl (original) +++ z3/deliverance/sandboxes/paul/xdv/compiler.xsl Wed Sep 23 15:59:59 2009 @@ -277,6 +277,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + From ldr at codespeak.net Wed Sep 23 18:53:08 2009 From: ldr at codespeak.net (ldr at codespeak.net) Date: Wed, 23 Sep 2009 18:53:08 +0200 (CEST) Subject: [z3-checkins] r67857 - z3/deliverance/sandboxes/paul/xdv Message-ID: <20090923165308.3BB7E16801F@codespeak.net> Author: ldr Date: Wed Sep 23 18:53:07 2009 New Revision: 67857 Modified: z3/deliverance/sandboxes/paul/xdv/compiler.xsl Log: restructure to allow before, after to always be used. prepend, copy, append may be mixed Modified: z3/deliverance/sandboxes/paul/xdv/compiler.xsl ============================================================================== --- z3/deliverance/sandboxes/paul/xdv/compiler.xsl (original) +++ z3/deliverance/sandboxes/paul/xdv/compiler.xsl Wed Sep 23 18:53:07 2009 @@ -127,186 +127,63 @@ + - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + WARNING: Multiple rules match a single theme node. Using drop. + + + + + + + ERROR: Multiple replace rules may not match a single theme node. + + + + + + + + + + + + + + + + @@ -322,6 +199,16 @@ + + + + + + + + @@ -355,4 +242,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ERROR: Multiple copy rules may not match a single theme node. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +