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
1=== removed symlink 'lib/ThreadedAsync'
2=== target was u'../sourcecode/zope/src/ThreadedAsync/'
3=== modified file 'lib/canonical/poppy/server.py'
4--- lib/canonical/poppy/server.py 2009-06-25 05:30:52 +0000
5+++ lib/canonical/poppy/server.py 2009-08-31 18:03:05 +0000
6@@ -3,24 +3,17 @@
7
8 __metaclass__ = type
9
10-import tempfile
11+import asyncore
12 import logging
13-import os
14 import sys
15-
16+import tempfile
17 from time import time
18
19-from zope.interface import implements
20-from zope.server.interfaces.ftp import IFileSystem
21-from zope.server.interfaces.ftp import IFileSystemAccess
22 from zope.server.ftp.server import FTPServerChannel
23 from zope.server.ftp.server import STORChannel as OriginalSTORChannel
24-from zope.server.ftp import server as ftp
25 from zope.server.taskthreads import ThreadedTaskDispatcher
26 from zope.server.serverbase import ServerBase
27
28-import ThreadedAsync
29-
30 from canonical.poppy.filesystem import UploadFileSystem
31
32
33@@ -160,7 +153,7 @@
34 task_dispatcher=task_dispatcher)
35 server.SERVER_IDENT = ident
36 try:
37- ThreadedAsync.loop()
38+ asyncore.loop()
39 except KeyboardInterrupt:
40 # Exit without spewing an exception.
41 pass
42@@ -189,7 +182,7 @@
43 def client_done_hook(fsroot, host, port):
44 print "client done:", fsroot, host, port
45
46- def auth_verify_hook(fsroot, user,passw):
47+ def auth_verify_hook(fsroot, user, passw):
48 print "Auth Verification hook:", fsroot, user, passw
49 return True
50
51
52=== removed symlink 'lib/docutils'
53=== target was u'../sourcecode/zope/src/docutils'
54=== modified file 'sourcecode/Makefile'
55--- sourcecode/Makefile 2009-06-18 13:56:46 +0000
56+++ sourcecode/Makefile 2009-08-31 17:00:26 +0000
57@@ -4,22 +4,16 @@
58 # the ones we test. If we fix them all to have EITHER a good makefile
59 # (build and check targets work), or no makefile we can reenable auto
60 # detection.
61-build_dirs:=bzr cscvs dulwich lazr-js lsprof pygettextpo pygpgme storm twisted zope
62-test_dirs:=bzr cscvs pygettextpo storm twisted zope
63-
64-STORM_TESTDB = storm_test
65+build_dirs:=cscvs dulwich lazr-js lsprof pygettextpo pygpgme twisted
66+test_dirs:=cscvs pygettextpo twisted
67
68 TEST_ENV_VARS = \
69 PYTHON=$(PYTHON) \
70- PYTHON_VERSION=$(PYTHON_VERSION) \
71- STORM_POSTGRES_URI=postgres:$(STORM_TESTDB) \
72- STORM_POSTGRES_HOST_URI=postgres://localhost/$(STORM_TESTDB) \
73- STORM_MYSQL_URI= \
74- STORM_MYSQL_HOST_URI=
75+ PYTHON_VERSION=$(PYTHON_VERSION)
76
77 all:
78
79-check: build storm_testdb
80+check: build
81 @ for subdir in ${test_dirs}; do \
82 $(MAKE) -C $$subdir check $(TEST_ENV_VARS) || exit $$?;\
83 done
84@@ -31,13 +25,4 @@
85 fi;\
86 done
87
88-# Storm's test suite expects the test database to exist before the
89-# test suite is run.
90-storm_testdb:
91- @echo "* Creating $(STORM_TESTDB)"
92- @if psql -l | grep -q " $(STORM_TESTDB) "; then \
93- dropdb $(STORM_TESTDB) >/dev/null; \
94- fi
95- createdb $(STORM_TESTDB)
96-
97-.PHONY: check all build storm_testdb
98+.PHONY: check all build