aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/app.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-11-13 20:23:26 -0600
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-11-13 20:23:26 -0600
commitee91c2b88d1a42b9d15d34d2c081cd8394649041 (patch)
tree01a75b958b2814763a0b219145bbe284d1d04931 /mediagoblin/app.py
parent4671fda345394dad9ca4278b1cf7b2cdf7d2b4ee (diff)
parent285ffeddf3542201b83072d3be544c85e9c487c2 (diff)
downloadmediagoblin-ee91c2b88d1a42b9d15d34d2c081cd8394649041.tar.lz
mediagoblin-ee91c2b88d1a42b9d15d34d2c081cd8394649041.tar.xz
mediagoblin-ee91c2b88d1a42b9d15d34d2c081cd8394649041.zip
Merge remote-tracking branch 'remotes/nyergler/pep8-ification'
Conflicts: mediagoblin/db/migrations.py mediagoblin/db/models.py mediagoblin/user_pages/views.py mediagoblin/util.py
Diffstat (limited to 'mediagoblin/app.py')
-rw-r--r--mediagoblin/app.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index d39469c3..ce4b0bec 100644
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -94,7 +94,7 @@ class MediaGoblinApp(object):
# object.
#######################################################
- setup_globals(app = self)
+ setup_globals(app=self)
# Workbench *currently* only used by celery, so this only
# matters in always eager mode :)
@@ -104,7 +104,6 @@ class MediaGoblinApp(object):
self.middleware = [common.import_component(m)(self)
for m in middleware.ENABLED_MIDDLEWARE]
-
def __call__(self, environ, start_response):
request = Request(environ)