aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/db/open.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-07-12 16:24:36 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-07-12 16:24:36 -0500
commit5305fee13b9f0a2b8f5ebe61f12c09c9cada3cca (patch)
tree7ffa78df3fbac665d32238d151fe76d07f4d995e /mediagoblin/db/open.py
parentac08a9acaffbafdcb99506495a192b1eaa508544 (diff)
parent4259ad5bf1680896090290e7327b49a053a8447b (diff)
downloadmediagoblin-5305fee13b9f0a2b8f5ebe61f12c09c9cada3cca.tar.lz
mediagoblin-5305fee13b9f0a2b8f5ebe61f12c09c9cada3cca.tar.xz
mediagoblin-5305fee13b9f0a2b8f5ebe61f12c09c9cada3cca.zip
Merge branch 'rodney757-media_plugins'
Conflicts: mediagoblin.ini mediagoblin/tests/test_mgoblin_app.ini
Diffstat (limited to 'mediagoblin/db/open.py')
-rw-r--r--mediagoblin/db/open.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/mediagoblin/db/open.py b/mediagoblin/db/open.py
index 0b1679fb..4ff0945f 100644
--- a/mediagoblin/db/open.py
+++ b/mediagoblin/db/open.py
@@ -52,10 +52,6 @@ class DatabaseMaster(object):
def load_models(app_config):
import mediagoblin.db.models
- for media_type in app_config['media_types']:
- _log.debug("Loading %s.models", media_type)
- __import__(media_type + ".models")
-
for plugin in mg_globals.global_config.get('plugins', {}).keys():
_log.debug("Loading %s.models", plugin)
try: