Merge pull request #149 from kini/flaskext

Adapt to new Flask extension module schema
sagemath · Apr 2, 2013 · a2046d3 · a2046d3
2 parents c3f57d9 + 5511a2a
commit a2046d3
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 18 deletions.
diff --git a/flask_version/admin.py b/flask_version/admin.py
@@ -1,7 +1,7 @@
 import os
 from flask import Module, url_for, render_template, request, session, redirect, g, current_app
 from decorators import login_required, admin_required, with_lock
-from flaskext.babel import Babel, gettext, ngettext, lazy_gettext
+from flask.ext.babel import Babel, gettext, ngettext, lazy_gettext
 _ = gettext
 
 admin = Module('flask_version.admin')
@@ -107,7 +107,7 @@ def notebook_settings():
 
     #Make changes to the default language used
     if 'default_language' in request.values:
-        from flaskext.babel import refresh
+        from flask.ext.babel import refresh
         refresh()
         current_app.config['BABEL_DEFAULT_LOCALE'] = request.values['default_language']
 

diff --git a/flask_version/authentication.py b/flask_version/authentication.py
@@ -2,7 +2,7 @@
 import random
 from flask import Module, url_for, render_template, request, session, redirect, g, current_app
 from decorators import with_lock
-from flaskext.babel import gettext, ngettext, lazy_gettext
+from flask.ext.babel import gettext, ngettext, lazy_gettext
 _ = gettext
 
 authentication = Module('flask_version.authentication')

diff --git a/flask_version/base.py b/flask_version/base.py
@@ -5,10 +5,10 @@
 from decorators import login_required, guest_or_login_required, with_lock
 from decorators import global_lock
 
-from flaskext.autoindex import AutoIndex
+from flask.ext.autoindex import AutoIndex
 SRC = os.path.join(os.environ['SAGE_ROOT'], 'devel', 'sage', 'sage')
 from flask.ext.openid import OpenID
-from flaskext.babel import Babel, gettext, ngettext, lazy_gettext, get_locale
+from flask.ext.babel import Babel, gettext, ngettext, lazy_gettext, get_locale
 from sagenb.misc.misc import SAGENB_ROOT, DATA, SAGE_DOC, translations_path
 
 oid = OpenID()

diff --git a/flask_version/decorators.py b/flask_version/decorators.py
@@ -1,6 +1,6 @@
 from functools import wraps
 from flask import Flask, url_for, render_template, request, session, redirect, g, current_app
-from flaskext.babel import Babel, gettext, ngettext, lazy_gettext
+from flask.ext.babel import Babel, gettext, ngettext, lazy_gettext
 _ = gettext
 
 from threading import Lock

diff --git a/flask_version/worksheet.py b/flask_version/worksheet.py
@@ -3,7 +3,7 @@
 from flask import Module, url_for, render_template, request, session, redirect, g, current_app
 from decorators import login_required, with_lock
 from collections import defaultdict
-from flaskext.babel import Babel, gettext, ngettext, lazy_gettext
+from flask.ext.babel import Babel, gettext, ngettext, lazy_gettext
 _ = gettext
 
 from sagenb.notebook.interact import INTERACT_UPDATE_PREFIX

diff --git a/flask_version/worksheet_listing.py b/flask_version/worksheet_listing.py
@@ -4,7 +4,7 @@
 import urllib, urlparse
 from flask import Module, url_for, render_template, request, session, redirect, g, current_app
 from decorators import login_required, guest_or_login_required, with_lock
-from flaskext.babel import Babel, gettext, ngettext, lazy_gettext
+from flask.ext.babel import Babel, gettext, ngettext, lazy_gettext
 _ = gettext
 
 worksheet_listing = Module('flask_version.worksheet_listing')

diff --git a/sagenb/notebook/challenge.py b/sagenb/notebook/challenge.py
@@ -27,7 +27,7 @@
 import os, random, re, urllib2, urllib
 
 from sagenb.notebook.template import template
-from flaskext.babel import gettext, lazy_gettext
+from flask.ext.babel import gettext, lazy_gettext
 _ = lazy_gettext
 
 class ChallengeResponse(object):

diff --git a/sagenb/notebook/conf.py b/sagenb/notebook/conf.py
@@ -9,7 +9,7 @@
 #  The full text of the GPL is available at:
 #                  http://www.gnu.org/licenses/
 #############################################################################
-from flaskext.babel import gettext, lazy_gettext
+from flask.ext.babel import gettext, lazy_gettext
 
 POS = 'pos'
 DESC = 'desc'

diff --git a/sagenb/notebook/notebook.py b/sagenb/notebook/notebook.py
@@ -45,7 +45,7 @@
 from . import user_conf    # user configuration
 from . import user         # users
 from   template import template, prettify_time_ago
-from flaskext.babel import gettext, lazy_gettext
+from flask.ext.babel import gettext, lazy_gettext
 
 try:
     # sage is installed

diff --git a/sagenb/notebook/register.py b/sagenb/notebook/register.py
@@ -12,7 +12,7 @@
 """
 Helper functions dealing with the verification of user  
 """
-from flaskext.babel import gettext as _
+from flask.ext.babel import gettext as _
 
 def build_msg(key, username, addr, port, secure):
     url_prefix = "https" if secure else "http"

diff --git a/sagenb/notebook/server_conf.py b/sagenb/notebook/server_conf.py
@@ -8,7 +8,7 @@
 from conf import (POS, DESC, GROUP, TYPE, CHOICES, T_BOOL, T_INTEGER,
                   T_CHOICE, T_REAL, T_COLOR, T_STRING, T_LIST, T_INFO)
 from sagenb.misc.misc import get_languages
-from flaskext.babel import gettext, lazy_gettext
+from flask.ext.babel import gettext, lazy_gettext
 _ = lazy_gettext
 
 defaults = {'word_wrap_cols':72,

diff --git a/sagenb/notebook/template.py b/sagenb/notebook/template.py
@@ -21,7 +21,7 @@
 
 from sagenb.misc.misc import SAGE_VERSION, DATA, unicode_str
 from sagenb.notebook.cell import number_of_rows
-from flaskext.babel import gettext, ngettext, lazy_gettext
+from flask.ext.babel import gettext, ngettext, lazy_gettext
 
 if os.environ.has_key('SAGENB_TEMPLATE_PATH'):
     if not os.path.isdir(os.environ['SAGENB_TEMPLATE_PATH']):

diff --git a/sagenb/notebook/tutorial.py b/sagenb/notebook/tutorial.py
@@ -348,7 +348,7 @@ def f(n):
 
 #####################################
 
-from flaskext.babel import lazy_gettext as _
+from flask.ext.babel import lazy_gettext as _
 
 notebook_help = [
     (_('Find Help and Documentation'),

diff --git a/sagenb/notebook/user_conf.py b/sagenb/notebook/user_conf.py
@@ -7,7 +7,7 @@
 from conf import (Configuration, POS, DESC, GROUP, TYPE, CHOICES, T_BOOL,
                   T_INTEGER, T_CHOICE, T_REAL, T_COLOR, T_STRING, T_LIST)
 from sagenb.misc.misc import SAGENB_ROOT, get_languages
-from flaskext.babel import lazy_gettext
+from flask.ext.babel import lazy_gettext
 
 defaults = {'max_history_length':1000,
             'default_system':'sage',

diff --git a/sagenb/notebook/worksheet.py b/sagenb/notebook/worksheet.py
@@ -57,7 +57,7 @@
 # Imports specifically relevant to the sage notebook
 from cell import Cell, TextCell
 from template import template, clean_name, prettify_time_ago
-from flaskext.babel import gettext, lazy_gettext
+from flask.ext.babel import gettext, lazy_gettext
 _ = gettext
 
 # Set some constants that will be used for regular expressions below.
@@ -4288,7 +4288,7 @@ def convert_time_to_string(t):
     Converts ``t`` (in Unix time) to a locale-specific string
     describing the time and date.
     """
-    from flaskext.babel import format_datetime
+    from flask.ext.babel import format_datetime
     import datetime, time
     try:
         return format_datetime(datetime.datetime.fromtimestamp(float(t)))