Merge branch 'rodney757-media_plugins'

Conflicts:
	mediagoblin.ini
	mediagoblin/tests/test_mgoblin_app.ini

diff --cc mediagoblin.ini
Simple merge

diff --cc mediagoblin/app.py
Simple merge

diff --cc mediagoblin/config_spec.ini
Simple merge

diff --cc mediagoblin/gmg_commands/dbupdate.py
index 22ad426c1046dd0fbe8bfb9518490870c4335326,4dfd7e927ca26ab2164964b6799876b585239bf5..00007567948999e365f28a6bb31c162b10ef0e6a
--- 1/mediagoblin/gmg_commands/dbupdate.py
--- 2/mediagoblin/gmg_commands/dbupdate.py
+++ b/mediagoblin/gmg_commands/dbupdate.py
@@@ -110,26 -103,13 +103,25 @@@ def run_dbupdate(app_config, global_con
      in the future, plugins)
      """
  
 +    # Set up the database
 +    db = setup_connection_and_db_from_config(app_config, migrations=True)
 +    #Run the migrations
 +    run_all_migrations(db, app_config, global_config)
 +
 +
 +def run_all_migrations(db, app_config, global_config):
 +    """
 +    Initializes or migrates a database that already has a 
 +    connection setup and also initializes or migrates all
 +    extensions based on the config files.
 +
 +    It can be used to initialize an in-memory database for
 +    testing.
 +    """
      # Gather information from all media managers / projects
      dbdatas = gather_database_data(
-             app_config['media_types'],
              global_config.get('plugins', {}).keys())
  
 -    # Set up the database
 -    db = setup_connection_and_db_from_config(app_config, migrations=True)
 -
      Session = sessionmaker(bind=db.engine)
  
      # Setup media managers for all dbdata, run init/migrate and print info

diff --cc mediagoblin/media_types/pdf/processing.py
Simple merge

diff --cc mediagoblin/tests/test_mgoblin_app.ini
index 5c3c46e7e7048c9d08912fa4cdabd18a22882e44,ecd6c9d2c830f8d23484cfe5c4db2961db1fe14c..535cf1c1dfbccdaaaa6fa7ae20b2267f7d7db3e2
--- 1/mediagoblin/tests/test_mgoblin_app.ini
--- 2/mediagoblin/tests/test_mgoblin_app.ini
+++ b/mediagoblin/tests/test_mgoblin_app.ini
@@@ -33,4 -30,5 +31,6 @@@ BROKER_HOST = "sqlite:///%(here)s/user_
  [[mediagoblin.plugins.httpapiauth]]
  [[mediagoblin.plugins.piwigo]]
  [[mediagoblin.plugins.basic_auth]]
 +[[mediagoblin.plugins.openid]]
+ [[mediagoblin.media_types.image]]
+ [[mediagoblin.media_types.pdf]]

diff --cc mediagoblin/tests/test_submission.py
Simple merge