falcon: Refactoring.

falcon/README.md

@@ -10,7 +10,7 @@ Falcon API framework (http://falconframework.org)
 
 * CPython 2.7
 * CPython 3.3
-* PyPy 2.0
+* PyPy 2.2
 
 ### Database
 

falcon/app.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python
-import sys
 import json
 
 import falcon
 
+
 # resource endpoints
 
 class JSONResource(object):
@@ -20,12 +20,8 @@ class PlaintextResource(object):
 # setup
 
 app = falcon.API()
-
-json_resource = JSONResource()
-plaintext_resource = PlaintextResource()
-
-app.add_route("/json", json_resource)
-app.add_route("/plaintext", plaintext_resource)
+app.add_route("/json", JSONResource())
+app.add_route("/plaintext", PlaintextResource())
 
 # entry point for debugging
 if __name__ == "__main__":

falcon/benchmark_config

@@ -12,12 +12,12 @@
       "framework": "falcon",
       "language": "Python",
       "orm": "Raw",
-      "platform": "wsgi",
-      "webserver": "Gunicorn",
+      "platform": "Gunicorn/Meinheld",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "falcon",
-      "notes": "",
+      "notes": "CPython 2",
       "versus": "wsgi"
     },
     "py3": {
@@ -31,12 +31,12 @@
       "framework": "falcon",
       "language": "Python",
       "orm": "Raw",
-      "platform": "wsgi",
-      "webserver": "Gunicorn",
+      "platform": "Gunicorn/Meinheld",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "falcon-py3",
-      "notes": "",
+      "notes": "CPython 3",
       "versus": "wsgi"
     },
     "pypy": {
@@ -50,12 +50,12 @@
       "framework": "falcon",
       "language": "Python",
       "orm": "Raw",
-      "platform": "pypy",
-      "webserver": "Gunicorn",
+      "platform": "Gunicorn/Tornado",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "falcon-pypy",
-      "notes": "",
+      "notes": "PyPy",
       "versus": "wsgi"
     }
   }]

falcon/setup.py

@@ -1,5 +1,4 @@
 import subprocess
-import setup_util
 import multiprocessing
 import os
 
@@ -21,6 +20,7 @@ def start(args):
         cwd="falcon")
     return 0
 
+
 def stop():
     p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
     out, err = p.communicate()

falcon/setup_py3.py

@@ -1,5 +1,4 @@
 import subprocess
-import setup_util
 import multiprocessing
 import os
 

falcon/setup_pypy.py

@@ -1,5 +1,4 @@
 import subprocess
-import setup_util
 import multiprocessing
 import os