Don't raise StopIteration from generator, return instead

See https://www.python.org/dev/peps/pep-0479/

23 files changed, 89 insertions, 0 deletions

diff --git a/tests/urlparser_data/__init__.py b/tests/urlparser_data/__init__.py
new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/tests/urlparser_data/__init__.py
@@ -0,0 +1 @@
+#
diff --git a/tests/urlparser_data/deep/index.html b/tests/urlparser_data/deep/index.html
new file mode 100644
index 0000000..8913442
--- /dev/null
+++ b/tests/urlparser_data/deep/index.html
@@ -0,0 +1 @@
+index2
diff --git a/tests/urlparser_data/deep/sub/Main.txt b/tests/urlparser_data/deep/sub/Main.txt
new file mode 100644
index 0000000..ec42756
--- /dev/null
+++ b/tests/urlparser_data/deep/sub/Main.txt
@@ -0,0 +1 @@
+index3
diff --git a/tests/urlparser_data/find_file/dir with spaces/test 4.html b/tests/urlparser_data/find_file/dir with spaces/test 4.html
new file mode 100644
index 0000000..1121e31
--- /dev/null
+++ b/tests/urlparser_data/find_file/dir with spaces/test 4.html
@@ -0,0 +1 @@
+test 4
diff --git a/tests/urlparser_data/find_file/index.txt b/tests/urlparser_data/find_file/index.txt
new file mode 100644
index 0000000..6be29bc
--- /dev/null
+++ b/tests/urlparser_data/find_file/index.txt
@@ -0,0 +1 @@
+index1
diff --git a/tests/urlparser_data/find_file/test 3.html b/tests/urlparser_data/find_file/test 3.html
new file mode 100644
index 0000000..954a536
--- /dev/null
+++ b/tests/urlparser_data/find_file/test 3.html
@@ -0,0 +1 @@
+test 3
diff --git a/tests/urlparser_data/find_file/test2.html b/tests/urlparser_data/find_file/test2.html
new file mode 100644
index 0000000..180cf83
--- /dev/null
+++ b/tests/urlparser_data/find_file/test2.html
@@ -0,0 +1 @@
+test2
diff --git a/tests/urlparser_data/hook/__init__.py b/tests/urlparser_data/hook/__init__.py
new file mode 100644
index 0000000..985a930
--- /dev/null
+++ b/tests/urlparser_data/hook/__init__.py
@@ -0,0 +1,10 @@
+from paste import request
+
+def urlparser_hook(environ):
+    first, rest = request.path_info_split(environ.get('PATH_INFO', ''))
+    if not first:
+        # No username
+        return
+    environ['app.user'] = first
+    environ['SCRIPT_NAME'] += '/' + first
+    environ['PATH_INFO'] = rest
diff --git a/tests/urlparser_data/hook/app.py b/tests/urlparser_data/hook/app.py
new file mode 100644
index 0000000..1a98013
--- /dev/null
+++ b/tests/urlparser_data/hook/app.py
@@ -0,0 +1,9 @@
+import six
+
+def application(environ, start_response):
+    start_response('200 OK', [('Content-type', 'text/html')])
+    body = 'user: %s' % environ['app.user']
+    if six.PY3:
+        body = body.encode('ascii')
+    return [body]
+
diff --git a/tests/urlparser_data/hook/index.py b/tests/urlparser_data/hook/index.py
new file mode 100644
index 0000000..92f3d66
--- /dev/null
+++ b/tests/urlparser_data/hook/index.py
@@ -0,0 +1,9 @@
+import six
+
+def application(environ, start_response):
+    start_response('200 OK', [('Content-type', 'text/html')])
+    body = 'index: %s' % environ['app.user']
+    if six.PY3:
+        body = body.encode('ascii')
+    return [body]
+
diff --git a/tests/urlparser_data/not_found/__init__.py b/tests/urlparser_data/not_found/__init__.py
new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/tests/urlparser_data/not_found/__init__.py
@@ -0,0 +1 @@
+#
diff --git a/tests/urlparser_data/not_found/recur/__init__.py b/tests/urlparser_data/not_found/recur/__init__.py
new file mode 100644
index 0000000..48205a5
--- /dev/null
+++ b/tests/urlparser_data/not_found/recur/__init__.py
@@ -0,0 +1,9 @@
+def not_found_hook(environ, start_response):
+    urlparser = environ['paste.urlparser.not_found_parser']
+    path = environ.get('PATH_INFO', '')
+    if not path:
+        return urlparser.not_found(environ, start_response)
+    # Strip off leading _'s
+    path = '/' + path.lstrip('/').lstrip('_')
+    environ['PATH_INFO'] = path
+    return urlparser(environ, start_response)
diff --git a/tests/urlparser_data/not_found/recur/isfound.txt b/tests/urlparser_data/not_found/recur/isfound.txt
new file mode 100644
index 0000000..c8b8fab
--- /dev/null
+++ b/tests/urlparser_data/not_found/recur/isfound.txt
@@ -0,0 +1 @@
+is found
diff --git a/tests/urlparser_data/not_found/simple/__init__.py b/tests/urlparser_data/not_found/simple/__init__.py
new file mode 100644
index 0000000..7186daa
--- /dev/null
+++ b/tests/urlparser_data/not_found/simple/__init__.py
@@ -0,0 +1,3 @@
+def not_found_hook(environ, start_response):
+    start_response('200 OK', [('Content-type', 'text/plain')])
+    return [b'not found']
diff --git a/tests/urlparser_data/not_found/simple/found.txt b/tests/urlparser_data/not_found/simple/found.txt
new file mode 100644
index 0000000..c8b8fab
--- /dev/null
+++ b/tests/urlparser_data/not_found/simple/found.txt
@@ -0,0 +1 @@
+is found
diff --git a/tests/urlparser_data/not_found/user/__init__.py b/tests/urlparser_data/not_found/user/__init__.py
new file mode 100644
index 0000000..4126c04
--- /dev/null
+++ b/tests/urlparser_data/not_found/user/__init__.py
@@ -0,0 +1,12 @@
+from paste import request
+
+def not_found_hook(environ, start_response):
+    urlparser = environ['paste.urlparser.not_found_parser']
+    first, rest = request.path_info_split(environ.get('PATH_INFO', ''))
+    if not first:
+        # No username
+        return
+    environ['app.user'] = first
+    environ['SCRIPT_NAME'] += '/' + first
+    environ['PATH_INFO'] = rest
+    return urlparser(environ, start_response)
diff --git a/tests/urlparser_data/not_found/user/list.py b/tests/urlparser_data/not_found/user/list.py
new file mode 100644
index 0000000..fd7482f
--- /dev/null
+++ b/tests/urlparser_data/not_found/user/list.py
@@ -0,0 +1,8 @@
+import six
+
+def application(environ, start_response):
+    start_response('200 OK', [('Content-type', 'text/plain')])
+    body = 'user: %s' % environ.get('app.user')
+    if six.PY3:
+        body = body.encode('ascii')
+    return [body]
diff --git a/tests/urlparser_data/python/__init__.py b/tests/urlparser_data/python/__init__.py
new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/tests/urlparser_data/python/__init__.py
@@ -0,0 +1 @@
+#
diff --git a/tests/urlparser_data/python/simpleapp.py b/tests/urlparser_data/python/simpleapp.py
new file mode 100644
index 0000000..7a36ce9
--- /dev/null
+++ b/tests/urlparser_data/python/simpleapp.py
@@ -0,0 +1,5 @@
+def application(environ, start_response):
+    start_response('200 OK', [('Content-type', 'text/html'),
+                              ('test-header', 'TEST!')])
+    return [b'test1']
+
diff --git a/tests/urlparser_data/python/stream.py b/tests/urlparser_data/python/stream.py
new file mode 100644
index 0000000..e81fd1c
--- /dev/null
+++ b/tests/urlparser_data/python/stream.py
@@ -0,0 +1,7 @@
+def stream():
+    def app(environ, start_response):
+        writer = start_response('200 OK', [('Content-type', 'text/html')])
+        writer(b'te')
+        writer(b'st')
+        return [b'2']
+    return app
diff --git a/tests/urlparser_data/python/sub/__init__.py b/tests/urlparser_data/python/sub/__init__.py
new file mode 100644
index 0000000..792d600
--- /dev/null
+++ b/tests/urlparser_data/python/sub/__init__.py
@@ -0,0 +1 @@
+#
diff --git a/tests/urlparser_data/python/sub/simpleapp.py b/tests/urlparser_data/python/sub/simpleapp.py
new file mode 100644
index 0000000..88bd975
--- /dev/null
+++ b/tests/urlparser_data/python/sub/simpleapp.py
@@ -0,0 +1,4 @@
+def application(environ, start_response):
+    start_response('200 OK', [('Content-type', 'text/html'),
+                              ('test-header', 'TEST!')])
+    return [b'subsimple']
diff --git a/tests/urlparser_data/secured.txt b/tests/urlparser_data/secured.txt
new file mode 100644
index 0000000..72b11b0
--- /dev/null
+++ b/tests/urlparser_data/secured.txt
@@ -0,0 +1 @@
+secured