Merge branch 'master' into debian

diff --git a/routefs/dictfs.py b/routefs/dictfs.py
index 25904b1..9226c70 100644 (file)
--- a/routefs/dictfs.py
+++ b/routefs/dictfs.py
@@ -31,7 +31,7 @@ class DictFS(routefs.RouteFS):
     def make_map(self):
         m = Mapper()
 
-        m.connect('*path', controller='handler')
+        m.connect('/{path:.*}', controller='handler')
 
         return m
 

diff --git a/routefs/examples/homefs.py b/routefs/examples/homefs.py
index a832c39..16c7bda 100755 (executable)
--- a/routefs/examples/homefs.py
+++ b/routefs/examples/homefs.py
@@ -24,8 +24,8 @@ class HomeFS(routefs.RouteFS):
 
     def make_map(self):
         m = Mapper()
-        m.connect('', controller='getList')
-        m.connect(':action', controller='getUser')
+        m.connect('/', controller='getList')
+        m.connect('/{action}', controller='getUser')
         return m
 
     def getUser(self, action, **kwargs):

diff --git a/routefs/examples/pyhesiodfs.py b/routefs/examples/pyhesiodfs.py
index 2a9bfb0..b3daa84 100755 (executable)
--- a/routefs/examples/pyhesiodfs.py
+++ b/routefs/examples/pyhesiodfs.py
@@ -17,9 +17,9 @@ class PyHesiodFS(routefs.RouteFS):
 
     def make_map(self):
         m = Mapper()
-        m.connect('', controller='getList')
-        m.connect('README.txt', controller='getReadme')
-        m.connect(':action', controller='getLocker')
+        m.connect('/', controller='getList')
+        m.connect('/README.txt', controller='getReadme')
+        m.connect('/{action}', controller='getLocker')
         return m
 
     def getLocker(self, action, **kwargs):

diff --git a/setup.py b/setup.py
index 6012ddf..74d735f 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -4,14 +4,14 @@ from setuptools import setup, find_packages
 
 setup(
     name="RouteFS",
-    version="1.1.0",
+    version="1.1.1",
     description="RouteFS: A FUSE API wrapper based on URL routing",
     author="Evan Broder",
     author_email="broder@mit.edu",
     url="http://github.com/ebroder/python-routefs/wikis",
     license="MPL, GPL",
     packages=find_packages(),
-    install_requires=['fuse_python>=0.2a', 'Routes>=1.7'],
+    install_requires=['fuse_python>=0.2a', 'Routes>=1.9'],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Plugins',