Merge remote-tracking branch 'origin/release/1.0.1'

Author: Matt George

HISTORY.md

@@ -1,3 +1,8 @@
+##1.0.1 (2011-04-12)
+* fixed bug with tempaltes and media in resweb
+* call to redis-py disconnect was failing, switched to connection.disconnect
+* interval cast to int for pyres_worker script command
+
 ## 0.9.1 (2010-10-15)
 * fixing issues #45, #46.
 	* #45 - resweb not working in chrome
@@ -72,4 +77,4 @@
 
 ## 0.1.0 (2009-12-01)
 
-* First release.
+* First release.

MANIFEST.in

@@ -0,0 +1 @@
+recursive-include resweb *.mustache media/*

pyres/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '1.0'
+__version__ = '1.0.1'
 
 from redis import Redis
 import pyres.json_parser as json
@@ -226,7 +226,7 @@ def close(self):
         """Close the underlying redis connection.
 
         """
-        self.redis.disconnect()
+        self.redis.connection.disconnect()
 
     def enqueue_at(self, datetime, klass, *args, **kwargs):
         class_name = '%s.%s' % (klass.__module__, klass.__name__)

pyres/scripts.py

@@ -100,7 +100,7 @@ def pyres_worker():
     setup_logging(log_level=log_level, filename=options.logfile)
     interval = options.interval
     if interval is not None:
-        interval = float(interval)
+        interval = int(interval)
 
     queues = args[0].split(',')
     server = '%s:%s' % (options.host,options.port)

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version='1.0'
+version='1.0.1'
 
 setup(
     name='pyres',

tests/test_resq.py

@@ -99,4 +99,7 @@ def test_queues(self):
         self.resq.enqueue_from_string('tests.Basic','basic2','test1')
         assert len(self.resq.queues()) == 2
         assert 'test' not in self.resq.queues()
-        assert 'basic' in self.resq.queues()
+        assert 'basic' in self.resq.queues()
+
+    def test_close(self):
+        self.resq.close()