Launchpad itself

Merge lp://staging/~gary/launchpad/poppyasync into lp://staging/launchpad

  1. poppyasync
  2. Merge into devel
Proposed by Gary Poster
Status: Merged
Approved by: Francis J. Lacoste
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp://staging/~gary/launchpad/poppyasync
Merge into: lp://staging/launchpad
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~gary/launchpad/poppyasync
Reviewer Review Type Date Requested Status
Francis J. Lacoste (community) Approve
Review via email: mp+10933@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Gary Poster (gary) wrote :

This fixes the (unintentionally) incomplete migration of getting rid of the zope branch.

- We no longer need to get docutils from the zope branch: we get it from a standard distribution via buildout.

- We no longer need ThreadedAsync at all. It is no longer used by Zope, and poppy can do just fine with asyncall.

- The sourcecode Makefile needed to have zope cleaned out. It also needed to have storm and bzr cleaned out from other buildout-releated changes.

- lib/canonical/poppy/server.py had some lint errors. I didn't investigate the bare excepts (lines 65, 133, and 142 of the file), but fixed the rest.

Thanks

Gary

Revision history for this message
Francis J. Lacoste (flacoste) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed symlink 'lib/ThreadedAsync'
=== target was u'../sourcecode/zope/src/ThreadedAsync/'
=== modified file 'lib/canonical/poppy/server.py'
--- lib/canonical/poppy/server.py 2009-06-25 05:30:52 +0000
+++ lib/canonical/poppy/server.py 2009-08-31 18:03:05 +0000
@@ -3,24 +3,17 @@
33
4__metaclass__ = type4__metaclass__ = type
55
6import tempfile6import asyncore
7import logging7import logging
8import os
9import sys8import sys
109import tempfile
11from time import time10from time import time
1211
13from zope.interface import implements
14from zope.server.interfaces.ftp import IFileSystem
15from zope.server.interfaces.ftp import IFileSystemAccess
16from zope.server.ftp.server import FTPServerChannel12from zope.server.ftp.server import FTPServerChannel
17from zope.server.ftp.server import STORChannel as OriginalSTORChannel13from zope.server.ftp.server import STORChannel as OriginalSTORChannel
18from zope.server.ftp import server as ftp
19from zope.server.taskthreads import ThreadedTaskDispatcher14from zope.server.taskthreads import ThreadedTaskDispatcher
20from zope.server.serverbase import ServerBase15from zope.server.serverbase import ServerBase
2116
22import ThreadedAsync
23
24from canonical.poppy.filesystem import UploadFileSystem17from canonical.poppy.filesystem import UploadFileSystem
2518
2619
@@ -160,7 +153,7 @@
160 task_dispatcher=task_dispatcher)153 task_dispatcher=task_dispatcher)
161 server.SERVER_IDENT = ident154 server.SERVER_IDENT = ident
162 try:155 try:
163 ThreadedAsync.loop()156 asyncore.loop()
164 except KeyboardInterrupt:157 except KeyboardInterrupt:
165 # Exit without spewing an exception.158 # Exit without spewing an exception.
166 pass159 pass
@@ -189,7 +182,7 @@
189 def client_done_hook(fsroot, host, port):182 def client_done_hook(fsroot, host, port):
190 print "client done:", fsroot, host, port183 print "client done:", fsroot, host, port
191184
192 def auth_verify_hook(fsroot, user,passw):185 def auth_verify_hook(fsroot, user, passw):
193 print "Auth Verification hook:", fsroot, user, passw186 print "Auth Verification hook:", fsroot, user, passw
194 return True187 return True
195188
196189
=== removed symlink 'lib/docutils'
=== target was u'../sourcecode/zope/src/docutils'
=== modified file 'sourcecode/Makefile'
--- sourcecode/Makefile 2009-06-18 13:56:46 +0000
+++ sourcecode/Makefile 2009-08-31 17:00:26 +0000
@@ -4,22 +4,16 @@
4# the ones we test. If we fix them all to have EITHER a good makefile4# the ones we test. If we fix them all to have EITHER a good makefile
5# (build and check targets work), or no makefile we can reenable auto5# (build and check targets work), or no makefile we can reenable auto
6# detection.6# detection.
7build_dirs:=bzr cscvs dulwich lazr-js lsprof pygettextpo pygpgme storm twisted zope7build_dirs:=cscvs dulwich lazr-js lsprof pygettextpo pygpgme twisted
8test_dirs:=bzr cscvs pygettextpo storm twisted zope8test_dirs:=cscvs pygettextpo twisted
9
10STORM_TESTDB = storm_test
119
12TEST_ENV_VARS = \10TEST_ENV_VARS = \
13 PYTHON=$(PYTHON) \11 PYTHON=$(PYTHON) \
14 PYTHON_VERSION=$(PYTHON_VERSION) \12 PYTHON_VERSION=$(PYTHON_VERSION)
15 STORM_POSTGRES_URI=postgres:$(STORM_TESTDB) \
16 STORM_POSTGRES_HOST_URI=postgres://localhost/$(STORM_TESTDB) \
17 STORM_MYSQL_URI= \
18 STORM_MYSQL_HOST_URI=
1913
20all:14all:
2115
22check: build storm_testdb16check: build
23 @ for subdir in ${test_dirs}; do \17 @ for subdir in ${test_dirs}; do \
24 $(MAKE) -C $$subdir check $(TEST_ENV_VARS) || exit $$?;\18 $(MAKE) -C $$subdir check $(TEST_ENV_VARS) || exit $$?;\
25 done19 done
@@ -31,13 +25,4 @@
31 fi;\25 fi;\
32 done26 done
3327
34# Storm's test suite expects the test database to exist before the28.PHONY: check all build
35# test suite is run.
36storm_testdb:
37 @echo "* Creating $(STORM_TESTDB)"
38 @if psql -l | grep -q " $(STORM_TESTDB) "; then \
39 dropdb $(STORM_TESTDB) >/dev/null; \
40 fi
41 createdb $(STORM_TESTDB)
42
43.PHONY: check all build storm_testdb