mediagoblin.globals->mediagoblin.mg_globals

diff --git a/mediagoblin/app.py b/mediagoblin/app.py
index 5d5940394d0b24fc87c5381029892bae15119db9..a1c6b5123ea5d58b35fc69b6de3d5c0c947ac744 100644 (file)
--- a/mediagoblin/app.py
+++ b/mediagoblin/app.py
@@ -23,7 +23,7 @@ from webob import Request, exc
 
 from mediagoblin import routing, util, storage, staticdirect
 from mediagoblin.db.open import setup_connection_and_db_from_config
-from mediagoblin.globals import setup_globals
+from mediagoblin.mg_globals import setup_globals
 from mediagoblin.celery_setup import setup_celery_from_config
 from mediagoblin.workbench import WorkbenchManager, DEFAULT_WORKBENCH_DIR
 

diff --git a/mediagoblin/auth/lib.py b/mediagoblin/auth/lib.py
index f40e560f759fe3f19678b223ece4ade391b37905..08bbdd161e5ffaca458859086a46adf612129899 100644 (file)
--- a/mediagoblin/auth/lib.py
+++ b/mediagoblin/auth/lib.py
@@ -20,7 +20,7 @@ import random
 import bcrypt
 
 from mediagoblin.util import send_email, render_template
-from mediagoblin import globals as mgoblin_globals
+from mediagoblin import mg_globals
 
 
 def bcrypt_check_password(raw_pass, stored_hash, extra_salt=None):
@@ -112,7 +112,7 @@ def send_verification_email(user, request):
 
     # TODO: There is no error handling in place
     send_email(
-        mgoblin_globals.email_sender_address,
+        mg_globals.email_sender_address,
         [user['email']],
         # TODO
         # Due to the distributed nature of GNU MediaGoblin, we should

diff --git a/mediagoblin/celery_setup/from_celery.py b/mediagoblin/celery_setup/from_celery.py
index 71f93d766ab42034e0037e0621af9654cdf7c7f8..c8ccebc8cb1b54787d524a95fb39a928b6316172 100644 (file)
--- a/mediagoblin/celery_setup/from_celery.py
+++ b/mediagoblin/celery_setup/from_celery.py
@@ -22,7 +22,7 @@ from paste.deploy.converters import asbool
 from mediagoblin import storage
 from mediagoblin.db.open import setup_connection_and_db_from_config
 from mediagoblin.celery_setup import setup_celery_from_config
-from mediagoblin.globals import setup_globals
+from mediagoblin.mg_globals import setup_globals
 from mediagoblin.workbench import WorkbenchManager, DEFAULT_WORKBENCH_DIR
 
 

diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index d035b15b2a2ecdf1cedc2814784a346608c4458e..f1f625b76d954a831db6b5d8e62a2979e29270f6 100644 (file)
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -16,8 +16,6 @@
 
 from mongokit import DocumentMigration
 
-from mediagoblin import globals as mediagoblin_globals
-
 
 class MediaEntryMigration(DocumentMigration):
     def allmigration01_uploader_to_reference(self):

diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index 3da97a4911bf641cfd67331a75886f51cd565c99..d77cf61921496598baa99a84810f1abb5ac95580 100644 (file)
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -20,7 +20,7 @@ from mongokit import Document, Set
 
 from mediagoblin import util
 from mediagoblin.auth import lib as auth_lib
-from mediagoblin import globals as mediagoblin_globals
+from mediagoblin import mg_globals
 from mediagoblin.db import migrations
 from mediagoblin.db.util import ObjectId
 
@@ -114,7 +114,7 @@ class MediaEntry(Document):
     def generate_slug(self):
         self['slug'] = util.slugify(self['title'])
 
-        duplicate = mediagoblin_globals.database.media_entries.find_one(
+        duplicate = mg_globals.database.media_entries.find_one(
             {'slug': self['slug']})
         
         if duplicate:

diff --git a/mediagoblin/gmg_commands/migrate.py b/mediagoblin/gmg_commands/migrate.py
index e04fb3434d6db6aa96a781840c4318a06426081e..3ce25701276af2af6802d0806a4b78e87011af49 100644 (file)
--- a/mediagoblin/gmg_commands/migrate.py
+++ b/mediagoblin/gmg_commands/migrate.py
@@ -17,7 +17,6 @@
 
 from mediagoblin.db import migrations
 from mediagoblin.gmg_commands import util as commands_util
-from mediagoblin import globals as mgoblin_globals
 
 
 def migrate_parser_setup(subparser):

diff --git a/mediagoblin/gmg_commands/shell.py b/mediagoblin/gmg_commands/shell.py
index 9c0259dee9b4d697d7a9bcdf1cc77dc732a831fc..16caf3980c054c3810a064eeaf54984fa80d1f0e 100644 (file)
--- a/mediagoblin/gmg_commands/shell.py
+++ b/mediagoblin/gmg_commands/shell.py
@@ -17,7 +17,7 @@
 
 import code
 
-from mediagoblin import globals as mgoblin_globals
+from mediagoblin import mg_globals
 from mediagoblin.gmg_commands import util as commands_util
 
 
@@ -35,7 +35,7 @@ GNU MediaGoblin shell!
 ----------------------
 Available vars:
  - mgoblin_app: instantiated mediagoblin application
- - mgoblin_globals: mediagoblin.globals
+ - mg_globals: mediagoblin.globals
  - db: database instance
 """
 
@@ -50,5 +50,5 @@ def shell(args):
         banner=SHELL_BANNER,
         local={
             'mgoblin_app': mgoblin_app,
-            'mgoblin_globals': mgoblin_globals,
-            'db': mgoblin_globals.database})
+            'mg_globals': mg_globals,
+            'db': mg_globals.database})

diff --git a/mediagoblin/globals.py b/mediagoblin/mg_globals.py
similarity index 92%
rename from mediagoblin/globals.py
rename to mediagoblin/mg_globals.py
index 80d1f01d5524d474f39a0cc3536bb1b34cca1feb..2fca3c0ac1c5cd55d2c12acba09dd048a75070d8 100644 (file)
--- a/mediagoblin/globals.py
+++ b/mediagoblin/mg_globals.py
@@ -27,7 +27,7 @@ translations = gettext.find(
 
 
 def setup_globals(**kwargs):
-    from mediagoblin import globals as mg_globals
+    from mediagoblin import mg_globals
 
     for key, value in kwargs.iteritems():
         setattr(mg_globals, key, value)

diff --git a/mediagoblin/process_media/__init__.py b/mediagoblin/process_media/__init__.py
index 531eb16d7f6b6b67fc9ee46c3c38b8e46059196a..71a0a27722c0c5c894cff10154f98eb0fb2e2c9b 100644 (file)
--- a/mediagoblin/process_media/__init__.py
+++ b/mediagoblin/process_media/__init__.py
@@ -18,7 +18,7 @@ import Image
 from mediagoblin.db.util import ObjectId
 from celery.task import task
 
-from mediagoblin import globals as mg_globals
+from mediagoblin import mg_globals
 
 
 THUMB_SIZE = 200, 200

diff --git a/mediagoblin/tests/__init__.py b/mediagoblin/tests/__init__.py
index 46c7fd69eca7c48b9f105992f60ce7f25cec05a4..e9e2a59ae9caacd0a4e7534e9b9d2605142bfad7 100644 (file)
--- a/mediagoblin/tests/__init__.py
+++ b/mediagoblin/tests/__init__.py
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from .. import globals
+from mediagoblin import mg_globals
 
 
 def setup_package():
@@ -22,5 +22,5 @@ def setup_package():
 
 def teardown_package():
     print "Killing db ..."
-    globals.db_connection.drop_database(globals.database.name)
+    mg_globals.db_connection.drop_database(mg_globals.database.name)
     print "... done"

diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py
index cdfeccabbc9fa462c647844e1a28fdb82693baa6..3d5690935dc4d7d4dd2478daf07c97789f80b80f 100644 (file)
--- a/mediagoblin/tests/test_auth.py
+++ b/mediagoblin/tests/test_auth.py
@@ -20,7 +20,7 @@ from nose.tools import assert_equal
 
 from mediagoblin.auth import lib as auth_lib
 from mediagoblin.tests.tools import setup_fresh_app
-from mediagoblin import globals as mgoblin_globals
+from mediagoblin import mg_globals
 from mediagoblin import util
 
 
@@ -137,7 +137,7 @@ def test_register_views(test_app):
         u'Passwords must match.']
 
     ## At this point there should be no users in the database ;)
-    assert not mgoblin_globals.database.User.find().count()
+    assert not mg_globals.database.User.find().count()
 
     # Successful register
     # -------------------
@@ -158,7 +158,7 @@ def test_register_views(test_app):
         'mediagoblin/auth/register_success.html')
 
     ## Make sure user is in place
-    new_user = mgoblin_globals.database.User.find_one(
+    new_user = mg_globals.database.User.find_one(
         {'username': 'happygirl'})
     assert new_user
     assert new_user['status'] == u'needs_email_verification'
@@ -191,7 +191,7 @@ def test_register_views(test_app):
     context = util.TEMPLATE_TEST_CONTEXT[
         'mediagoblin/auth/verify_email.html']
     assert context['verification_successful'] == False
-    new_user = mgoblin_globals.database.User.find_one(
+    new_user = mg_globals.database.User.find_one(
         {'username': 'happygirl'})
     assert new_user
     assert new_user['status'] == u'needs_email_verification'
@@ -203,7 +203,7 @@ def test_register_views(test_app):
     context = util.TEMPLATE_TEST_CONTEXT[
         'mediagoblin/auth/verify_email.html']
     assert context['verification_successful'] == True
-    new_user = mgoblin_globals.database.User.find_one(
+    new_user = mg_globals.database.User.find_one(
         {'username': 'happygirl'})
     assert new_user
     assert new_user['status'] == u'active'

diff --git a/mediagoblin/tests/test_globals.py b/mediagoblin/tests/test_globals.py
index 6d2e01dab8814a09fb906b150593249586192143..59d217f3be0ec4dbae95f1afe347c8a401344fbe 100644 (file)
--- a/mediagoblin/tests/test_globals.py
+++ b/mediagoblin/tests/test_globals.py
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from mediagoblin import globals as mg_globals
+from mediagoblin import mg_globals
 
 def test_setup_globals():
     mg_globals.setup_globals(

diff --git a/mediagoblin/tests/test_tests.py b/mediagoblin/tests/test_tests.py
index 3ecbfac78203bf60fe898b268d03d5fa617dc8b5..8ac7f0a4352c7d6727dcaf18d1da60caaacac3a3 100644 (file)
--- a/mediagoblin/tests/test_tests.py
+++ b/mediagoblin/tests/test_tests.py
@@ -16,7 +16,7 @@
 
 from mediagoblin.tests.tools import get_test_app
 
-from mediagoblin import globals as mgoblin_globals
+from mediagoblin import mg_globals
 
 
 def test_get_test_app_wipes_db():
@@ -24,15 +24,15 @@ def test_get_test_app_wipes_db():
     Make sure we get a fresh database on every wipe :)
     """
     get_test_app()
-    assert mgoblin_globals.database.User.find().count() == 0
+    assert mg_globals.database.User.find().count() == 0
 
-    new_user = mgoblin_globals.database.User()
+    new_user = mg_globals.database.User()
     new_user['username'] = u'lolcat'
     new_user['email'] = u'lol@cats.example.org'
     new_user['pw_hash'] = u'pretend_this_is_a_hash'
     new_user.save()
-    assert mgoblin_globals.database.User.find().count() == 1
+    assert mg_globals.database.User.find().count() == 1
 
     get_test_app()
 
-    assert mgoblin_globals.database.User.find().count() == 0
+    assert mg_globals.database.User.find().count() == 0

diff --git a/mediagoblin/util.py b/mediagoblin/util.py
index 64e21ca99e982c2d949bd0f7a8ab3b8e59ebfabe..f29f8570d3c563a6c3e74f487fb827a823eddd65 100644 (file)
--- a/mediagoblin/util.py
+++ b/mediagoblin/util.py
@@ -31,7 +31,7 @@ import translitcodec
 from paste.deploy.loadwsgi import NicerConfigParser
 from webob import Response, exc
 
-from mediagoblin import globals as mgoblin_globals
+from mediagoblin import mg_globals
 from mediagoblin.db.util import ObjectId
 
 
@@ -102,8 +102,8 @@ def get_jinja_env(template_loader, locale):
         extensions=['jinja2.ext.i18n'])
 
     template_env.install_gettext_callables(
-        mgoblin_globals.translations.gettext,
-        mgoblin_globals.translations.ngettext)
+        mg_globals.translations.gettext,
+        mg_globals.translations.ngettext)
 
     if exists(locale):
         SETUP_JINJA_ENVS[locale] = template_env
@@ -264,9 +264,9 @@ def send_email(from_addr, to_addrs, subject, message_body):
      - message_body: email body text
     """
     # TODO: make a mock mhost if testing is enabled
-    if TESTS_ENABLED or mgoblin_globals.email_debug_mode:
+    if TESTS_ENABLED or mg_globals.email_debug_mode:
         mhost = FakeMhost()
-    elif not mgoblin_globals.email_debug_mode:
+    elif not mg_globals.email_debug_mode:
         mhost = smtplib.SMTP()
 
     mhost.connect()
@@ -279,7 +279,7 @@ def send_email(from_addr, to_addrs, subject, message_body):
     if TESTS_ENABLED:
         EMAIL_TEST_INBOX.append(message)
 
-    if getattr(mgoblin_globals, 'email_debug_mode', False):
+    if getattr(mg_globals, 'email_debug_mode', False):
         print u"===== Email ====="
         print u"From address: %s" % message['From']
         print u"To addresses: %s" % message['To']
@@ -393,7 +393,7 @@ def setup_gettext(locale):
         if exists(locale):
             SETUP_GETTEXTS[locale] = this_gettext
 
-    mgoblin_globals.setup_globals(
+    mg_globals.setup_globals(
         translations=this_gettext)