From 8dfa15c2d460839667092e578311fad53cf7bea9 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Mon, 7 Sep 2015 16:05:16 +0200
Subject: [PATCH] whitelist next_layer for @concurrent

---
 libmproxy/script.py |  3 ++-
 setup.py            | 12 +++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/libmproxy/script.py b/libmproxy/script.py
index e13f0e2b6..db909a5d5 100644
--- a/libmproxy/script.py
+++ b/libmproxy/script.py
@@ -179,7 +179,8 @@ def concurrent(fn):
             "error",
             "clientconnect",
             "serverconnect",
-            "clientdisconnect"):
+            "clientdisconnect",
+            "next_layer"):
         def _concurrent(ctx, obj):
             _handle_concurrent_reply(fn, obj, ctx, obj)
 
diff --git a/setup.py b/setup.py
index e28033ad1..896d02480 100644
--- a/setup.py
+++ b/setup.py
@@ -83,7 +83,8 @@ setup(
         "Topic :: Internet",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: Internet :: Proxy Servers",
-        "Topic :: Software Development :: Testing"],
+        "Topic :: Software Development :: Testing"
+    ],
     packages=find_packages(),
     include_package_data=True,
     entry_points={
@@ -94,8 +95,13 @@ setup(
         'contentviews': [
             "pyamf>=0.6.1",
             "protobuf>=2.5.0",
-            "cssutils>=1.0"],
+            "cssutils>=1.0"
+        ],
         'examples': [
             "pytz",
             "harparser",
-            "beautifulsoup4"]})
+            "beautifulsoup4",
+            "enum34"
+        ]
+    }
+)