Lot of changes from Joy Team

.gitignore

@@ -6,3 +6,9 @@ build
 tmp
 *.dep
 .settings
+*.egg
+lib/concurrence/http/concurrence.http._http.c
+lib/concurrence/concurrence._event14.c
+concurrence.egg-info
+debian/concurrence
+*.swp

Makefile

@@ -1,3 +1,14 @@
+CWD=$(shell pwd)
+ifndef PYTHON
+    export PYTHON=python2.6
+endif
+ifndef DESTDIR
+    export DESTDIR=$(CWD)/debian/tmp
+endif
+export PYTHONPATH=/usr/share/pyshared:$(DESTDIR)/usr/lib/$(PYTHON)
+
+.PHONY: test install doc
+
 build:
 	$(PYTHON) setup.py build
 
@@ -7,19 +18,18 @@ ext:
 egg:
 	$(PYTHON) setup.py bdist_egg
 
-install:
-	$(PYTHON) setup.py install
+install: build
+	mkdir -p $(DESTDIR)/usr/lib/$(PYTHON)
+	$(PYTHON) setup.py install --prefix=$(DESTDIR)/usr --install-purelib=$(DESTDIR)/usr/lib/$(PYTHON) --install-platlib=$(DESTDIR)/usr/lib/$(PYTHON) --install-layout=deb --root=/
 
 sdist:
 	$(PYTHON) setup.py sdist
 
-_doc:
+doc:
 	rm -rf doc/html
 	cd doc/src; make html
 	cp -a doc/src/_build/html doc/html
 
-doc: _doc
-
 clean:
 	-find . -name *.pyc -exec rm -rf {} \;
 	-find . -name *.so -exec rm -rf {} \;
@@ -38,10 +48,17 @@ clean:
 dist_clean: clean
 	find . -name .svn -exec rm -rf {} \;
 
-_test: 
+test: install
 	cd test; make test
 
-test: _test 
+test-test: install
+	$(PYTHON) test/testtest.py
+
+test-core: install
+	$(PYTHON) test/testcore.py
+
+test-memcache: install
+	$(PYTHON) test/testmemcache.py
 
 coverage:
 	cd test; coverage erase

debian/.gitignore

@@ -0,0 +1,3 @@
+*.log
+*.substvars
+/files

debian/changelog

@@ -0,0 +1,187 @@
+concurrence (0.3.2-26) unstable; urgency=low
+
+  * Children of destroyed parents are adopted by grandparents
+
+ -- Alexander Lourier <[email protected]>  Sat, 03 Aug 2013 23:11:44 +0400
+
+concurrence (0.3.2-25) unstable; urgency=low
+
+  * Daemons are not excluded from tasklets hierarchy
+
+ -- Alexander Lourier <[email protected]>  Sat, 03 Aug 2013 21:52:44 +0400
+
+concurrence (0.3.2-24) unstable; urgency=low
+
+  * MySQL: less verbose logging
+  * MySQL: keep connection after ClientCommandError
+
+ -- Alexander Lourier <[email protected]>  Tue, 30 Jul 2013 17:22:26 +0400
+
+concurrence (0.3.2-23) unstable; urgency=low
+
+  * Allow to close MySQL connection in other states
+
+ -- Alexander Lourier <[email protected]>  Wed, 26 Jun 2013 13:52:15 +0400
+
+concurrence (0.3.2-22) unstable; urgency=low
+
+  * MySQL logging fixed
+
+ -- Alexander Lourier <[email protected]>  Wed, 26 Jun 2013 12:39:49 +0400
+
+concurrence (0.3.2-21) unstable; urgency=low
+
+  * Correctly handle requests interrupted by client when sending request body
+
+ -- Alexander Lourier <[email protected]>  Sun, 28 Oct 2012 01:42:04 +0400
+
+concurrence (0.3.2-20) unstable; urgency=low
+
+  * Memcached: survive after connection loss
+
+ -- Alexander Lourier <[email protected]>  Mon, 01 Oct 2012 01:17:03 +0400
+
+concurrence (0.3.2-19) unstable; urgency=low
+
+  * Memcached: handle exceptions during flush
+  * HEAD support for HTTP Server
+  * CompatibileFile fixes
+  * BufferedReader: corner case bugfixes
+  * Test environment enhancements
+  * Major race condition in concurrence core fixed
+  * BaseExceptions are not handled anymore
+
+ -- Alexander Lourier <[email protected]>  Sun, 30 Sep 2012 19:34:19 +0400
+
+concurrence (0.3.2-18) unstable; urgency=low
+
+  * MySQL RLE encoding support for 253 code
+
+ -- Alexander Lourier <[email protected]>  Thu, 22 Mar 2012 12:03:09 +0400
+
+concurrence (0.3.2-17) unstable; urgency=low
+
+  * Error handling in Memcached module
+
+ -- Alexander Lourier <[email protected]>  Wed, 14 Dec 2011 10:08:29 +0400
+
+concurrence (0.3.2-16) unstable; urgency=low
+
+  * HEAD method support
+  * 502 Not Implemented response to any not known method
+
+ -- Alexander Lourier <[email protected]>  Mon, 05 Sep 2011 14:33:20 +0400
+
+concurrence (0.3.2-15) unstable; urgency=low
+
+  * WSGIInputStream.readline() now accepts parameter maxlen=-1 (does nothing although)
+
+ -- Alexander Lourier <[email protected]>  Mon, 15 Aug 2011 13:59:17 +0400
+
+concurrence (0.3.2-14) unstable; urgency=low
+
+  * readline() now accepts parameter maxlen=-1 (does nothing although)
+
+ -- Alexander Lourier <[email protected]>  Mon, 15 Aug 2011 13:55:53 +0400
+
+concurrence (0.3.2-13) unstable; urgency=low
+
+  * Moving to squeeze
+
+ -- Alexander Lourier <[email protected]>  Sun, 13 Feb 2011 22:19:34 +0300
+
+concurrence (0.3.2-12) unstable; urgency=low
+
+  * Bugfix with ADNS
+
+ -- Alexander Lourier <[email protected]>  Sun, 07 Nov 2010 00:32:55 +0300
+
+concurrence (0.3.2-11) unstable; urgency=low
+
+  * ADNS support
+
+ -- Alexander Lourier <[email protected]>  Sat, 06 Nov 2010 20:23:53 +0300
+
+concurrence (0.3.2-10) unstable; urgency=low
+
+  * Thrift and SMTP implementation
+
+ -- Alexander Lourier <[email protected]>  Sat, 30 Oct 2010 10:38:57 +0400
+
+concurrence (0.3.2-9) unstable; urgency=low
+
+  * Deferred evaluation of chunks
+
+ -- Alexander Lourier <[email protected]>  Sun, 24 Oct 2010 01:56:14 +0400
+
+concurrence (0.3.2-8) unstable; urgency=low
+
+  * Minor changes
+
+ -- Alexander Lourier <[email protected]>  Sat, 23 Oct 2010 01:34:17 +0400
+
+concurrence (0.3.2-6) unstable; urgency=low
+
+  * Size and time limits on HTTP client downloads
+
+ -- Alexander Lourier <[email protected]>  Thu, 09 Sep 2010 16:14:35 +0400
+
+concurrence (0.3.2-5) unstable; urgency=low
+
+  * Fixed bug with readline buffer size
+
+ -- Alexander Lourier <[email protected]>  Thu, 09 Sep 2010 14:51:32 +0400
+
+concurrence (0.3.2-4) unstable; urgency=low
+
+  * libevent dependency
+
+ -- Alexander Lourier <[email protected]>  Fri, 06 Aug 2010 13:54:01 +0400
+
+concurrence (0.3.2-2) unstable; urgency=low
+
+  * WSGIInputStream.readline implemented
+
+ -- Alexander Lourier <[email protected]>  Wed, 04 Aug 2010 17:24:40 +0400
+
+concurrence (0.3.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Alexander Lourier <[email protected]>  Fri, 04 Jun 2010 19:46:52 +0400
+
+concurrence (0.3.1-6) unstable; urgency=low
+
+  * python-webob added to dependencies
+
+ -- Alexander Lourier <[email protected]>  Tue, 01 Jun 2010 18:08:50 +0400
+
+concurrence (0.3.1-5) unstable; urgency=low
+
+  * python-routes added to dependencies
+
+ -- Alexander Lourier <[email protected]>  Tue, 01 Jun 2010 17:57:25 +0400
+
+concurrence (0.3.1-4) unstable; urgency=low
+
+  * Library paths fixed
+
+ -- Alexander Lourier <[email protected]>  Tue, 01 Jun 2010 16:01:15 +0400
+
+concurrence (0.3.1-3) unstable; urgency=low
+
+  * Disabled pysupport
+
+ -- Alexander Lourier <[email protected]>  Tue, 01 Jun 2010 13:10:17 +0400
+
+concurrence (0.3.1-2) unstable; urgency=low
+
+  * fixed install dir
+
+ -- Alexander Lourier <[email protected]>  Sat, 27 Mar 2010 21:15:46 +0300
+
+concurrence (0.3.1-1) unstable; urgency=low
+
+  * Initial release
+
+ -- Alexander Lourier <[email protected]>  Sat, 27 Mar 2010 19:24:28 +0300

debian/compat

@@ -0,0 +1 @@
+7

debian/control

@@ -0,0 +1,18 @@
+Source: concurrence
+Section: python
+Priority: optional
+Maintainer: Alexander Lourier <[email protected]>
+Build-Depends: debhelper (>= 7), python2.6-minimal (>= 2.6.stackless-1), libevent-dev (>= 1.4), python-pyrex, python2.6-dev (>= 2.6.stackless-1)
+Standards-Version: 3.8.3
+Homepage: http://opensource.hyves.org/concurrence/
+
+Package: concurrence
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, python2.6-minimal (>= 2.6.stackless-1), libevent-1.4-2, ${python:Depends}
+Recommends: python-routes, python-webob
+Description: Framework for creating massively concurrent network applications in Python.
+ It takes a Lightweight-tasks-with-message-passing approach to concurrency.
+ The goal of Concurrence is to provide an easier programming model for writing
+ high performance network applications than existing solutions (Multi-threading,
+ Twisted, asyncore etc). Concurrence uses Lightweight tasks in combination with
+ libevent to expose a high-level synchronous API to low-level asynchronous IO.

debian/copyright

@@ -0,0 +1,27 @@
+Copyright (C) 2009, Hyves (Startphone Ltd.)
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+    * Neither the name of Hyves (Startphone Ltd.) nor the names of its
+      contributors may be used to endorse or promote products derived from this
+      software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

debian/docs

@@ -0,0 +1,3 @@
+README
+TEST.TXT
+doc/

debian/rules

@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+export PYTHON=python2.6
+export DEB_BUILD_OPTIONS="nocheck"
+
+%:
+	#dh --without=python-support $@
+	dh $@

lib/concurrence/__init__.py

@@ -2,7 +2,7 @@
 #
 # This module is part of the Concurrence Framework and is released under
 # the New BSD License: http://www.opensource.org/licenses/bsd-license.php
-__version__ = '0.3.1' #remember to update setup.py
+__version__ = '0.3.2' #remember to update setup.py
 __version_info__ = tuple([ int(num) for num in __version__.split('.')])
 
 from concurrence.core import dispatch, quit, disable_threading, get_version_info, TIMEOUT_NEVER, TIMEOUT_CURRENT
@@ -16,10 +16,10 @@
 
 try:
     import json
-except:
+except Exception:
     try:
         import simplejson as json
-    except:
+    except Exception:
         import logging
         logging.exception("could not import json library!', pls install simplejson or use python 2.6+")
 

lib/concurrence/_unittest.py

@@ -56,14 +56,14 @@ def interceptor(addr):
 
 
 class TestCase(unittest.TestCase):
-    def setUp(self):
-        logging.debug("setUp %s, %s", self, '; '.join(['%s: %s' % (k, v) for k, v in get_version_info().items()]))
+    #def setUp(self):
+    #    logging.debug("setUp %s, %s", self, '; '.join(['%s: %s' % (k, v) for k, v in get_version_info().items()]))
 
     def tearDown(self):
         try:
             Tasklet.yield_() #this make sure that everything gets a change to exit before we start the next test
-            logging.debug("tearDown %s, tasklet count #%d", self, Tasklet.count())
-        except:
+            #logging.debug("tearDown %s, tasklet count #%d", self, Tasklet.count())
+        except Exception:
             pass
 
 class _Timer:
@@ -83,13 +83,15 @@ def sec(self, n):
 def timer():
     return _Timer()
 
-def main(timeout = None):
+def main(timeout = None, ontimeout = None):
 
     logging.basicConfig()
     logging.root.setLevel(logging.DEBUG)
 
     if timeout is not None:
         def quit_test():
+            if ontimeout:
+                ontimeout()
             logging.error("quiting unittest on timeout")
             quit(EXIT_CODE_TIMEOUT)
         logging.debug("test will timeout in %s seconds", timeout)

lib/concurrence/application.py

@@ -66,7 +66,7 @@ def start(self):
         for _, resource, fa, member in self._find_members(r'__start(\d\d)__'):
             try:
                 level = int(fa[0])
-            except:
+            except Exception:
                 level = -1
 
             if level != -1: