Blob Blame History Raw
--- build/pkgs/sagenb/src/sagenb/flask_version/admin.py.orig	2017-06-02 16:24:20.000000000 -0600
+++ build/pkgs/sagenb/src/sagenb/flask_version/admin.py	2018-06-15 16:07:44.250325912 -0600
@@ -1,7 +1,7 @@
 import os
 from flask import Blueprint, url_for, render_template, request, session, redirect, g, current_app
 from .decorators import login_required, admin_required, with_lock
-from flask.ext.babel import Babel, gettext, ngettext, lazy_gettext
+from flask_babel import Babel, gettext, ngettext, lazy_gettext
 _ = gettext
 
 admin = Blueprint('admin', 'sagenb.flask_version.admin')
--- build/pkgs/sagenb/src/sagenb/flask_version/authentication.py.orig	2017-06-02 16:24:20.000000000 -0600
+++ build/pkgs/sagenb/src/sagenb/flask_version/authentication.py	2018-06-15 16:06:44.083100080 -0600
@@ -2,7 +2,7 @@ import os
 import random
 from flask import Blueprint, url_for, render_template, request, session, redirect, g, current_app
 from .decorators import with_lock
-from flask.ext.babel import gettext, ngettext, lazy_gettext
+from flask_babel import gettext, ngettext, lazy_gettext
 _ = gettext
 
 authentication = Blueprint('authentication',
--- build/pkgs/sagenb/src/sagenb/flask_version/base.py.orig	2018-06-15 13:17:46.940191938 -0600
+++ build/pkgs/sagenb/src/sagenb/flask_version/base.py	2018-06-15 16:09:19.512516887 -0600
@@ -8,11 +8,11 @@ from flask import Flask, Blueprint, url_
 from .decorators import login_required, guest_or_login_required, with_lock
 from .decorators import global_lock
 
-from flask.ext.autoindex import AutoIndex
+from flask_autoindex import AutoIndex
 from sage.env import SAGE_SRC, SAGE_DOC
 SRC = os.path.join(SAGE_SRC, 'sage')
-from flask.ext.openid import OpenID
-from flask.ext.babel import Babel, gettext, ngettext, lazy_gettext, get_locale
+from flask_openid import OpenID
+from flask_babel import Babel, gettext, ngettext, lazy_gettext, get_locale
 from sagenb.misc.misc import SAGENB_ROOT, DATA, translations_path, N_, nN_, unicode_str
 from json import dumps
 from sagenb.notebook.cell import number_of_rows
--- build/pkgs/sagenb/src/sagenb/flask_version/decorators.py.orig	2017-06-02 16:24:20.000000000 -0600
+++ build/pkgs/sagenb/src/sagenb/flask_version/decorators.py	2018-06-15 16:09:33.447105994 -0600
@@ -1,6 +1,6 @@
 from functools import wraps
 from flask import Flask, url_for, render_template, request, session, redirect, g, current_app
-from flask.ext.babel import Babel, gettext, ngettext, lazy_gettext
+from flask_babel import Babel, gettext, ngettext, lazy_gettext
 _ = gettext
 
 from threading import Lock
--- build/pkgs/sagenb/src/sagenb/flask_version/doc.py.orig	2017-06-02 16:24:20.000000000 -0600
+++ build/pkgs/sagenb/src/sagenb/flask_version/doc.py	2018-06-15 16:09:43.966795797 -0600
@@ -18,7 +18,7 @@ import os
 from flask import Blueprint, url_for, render_template, request, session, redirect, g, current_app
 from .decorators import login_required, guest_or_login_required
 
-from flask.ext.babel import gettext, ngettext, lazy_gettext
+from flask_babel import gettext, ngettext, lazy_gettext
 _ = gettext
 
 doc = Blueprint('doc', 'sagenb.flask_version.doc')
--- build/pkgs/sagenb/src/sagenb/flask_version/settings.py.orig	2017-06-02 16:24:20.000000000 -0600
+++ build/pkgs/sagenb/src/sagenb/flask_version/settings.py	2018-06-15 16:09:55.078468143 -0600
@@ -2,7 +2,7 @@ import os
 import random
 from flask import Blueprint, url_for, render_template, request, session, redirect, g, current_app
 from .decorators import login_required, with_lock
-from flask.ext.babel import gettext, ngettext, lazy_gettext
+from flask_babel import gettext, ngettext, lazy_gettext
 _ = gettext
 
 
--- build/pkgs/sagenb/src/sagenb/flask_version/worksheet_listing.py.orig	2017-06-02 16:24:20.000000000 -0600
+++ build/pkgs/sagenb/src/sagenb/flask_version/worksheet_listing.py	2018-06-15 16:07:22.393970396 -0600
@@ -5,7 +5,7 @@ import os
 import urllib, urlparse
 from flask import Blueprint, url_for, render_template, request, session, redirect, g, current_app
 from .decorators import login_required, guest_or_login_required, with_lock
-from flask.ext.babel import Babel, gettext, ngettext, lazy_gettext
+from flask_babel import Babel, gettext, ngettext, lazy_gettext
 _ = gettext
 
 worksheet_listing = Blueprint('worksheet_listing',
--- build/pkgs/sagenb/src/sagenb/flask_version/worksheet.py.orig	2017-06-02 16:24:20.000000000 -0600
+++ build/pkgs/sagenb/src/sagenb/flask_version/worksheet.py	2018-06-15 16:07:04.820488591 -0600
@@ -8,7 +8,7 @@ from flask import Blueprint, make_respon
 from .decorators import login_required, with_lock
 from collections import defaultdict
 from werkzeug.utils import secure_filename
-from flask.ext.babel import Babel, gettext, ngettext, lazy_gettext
+from flask_babel import Babel, gettext, ngettext, lazy_gettext
 _ = gettext
 
 from sagenb.notebook.interact import INTERACT_UPDATE_PREFIX
--- build/pkgs/sagenb/src/sagenb/notebook/challenge.py.orig	2017-06-02 16:24:20.000000000 -0600
+++ build/pkgs/sagenb/src/sagenb/notebook/challenge.py	2018-06-15 16:10:52.222783112 -0600
@@ -32,7 +32,7 @@ from six.moves.urllib.parse import urlen
 from six.moves.urllib.request import urlopen, Request
 
 from sagenb.notebook.template import template
-from flask.ext.babel import gettext, lazy_gettext
+from flask_babel import gettext, lazy_gettext
 _ = lazy_gettext
 
 class ChallengeResponse(object):
--- build/pkgs/sagenb/src/sagenb/notebook/conf.py.orig	2017-06-02 16:24:20.000000000 -0600
+++ build/pkgs/sagenb/src/sagenb/notebook/conf.py	2018-06-15 16:10:52.223783083 -0600
@@ -10,7 +10,7 @@ from __future__ import absolute_import
 #  The full text of the GPL is available at:
 #                  http://www.gnu.org/licenses/
 #############################################################################
-from flask.ext.babel import gettext, lazy_gettext
+from flask_babel import gettext, lazy_gettext
 
 POS = 'pos'
 DESC = 'desc'
--- build/pkgs/sagenb/src/sagenb/notebook/notebook.py.orig	2017-06-02 16:24:20.000000000 -0600
+++ build/pkgs/sagenb/src/sagenb/notebook/notebook.py	2018-06-15 16:10:52.236782699 -0600
@@ -51,7 +51,7 @@ from . import server_conf  # server conf
 from . import user_conf    # user configuration
 from . import user         # users
 from   .template import template, prettify_time_ago
-from flask.ext.babel import gettext, lazy_gettext
+from flask_babel import gettext, lazy_gettext
 
 try:
     # sage is installed
--- build/pkgs/sagenb/src/sagenb/notebook/register.py.orig	2017-06-02 16:24:20.000000000 -0600
+++ build/pkgs/sagenb/src/sagenb/notebook/register.py	2018-06-15 16:10:52.236782699 -0600
@@ -12,7 +12,7 @@
 """
 Helper functions dealing with the verification of user  
 """
-from flask.ext.babel import gettext as _
+from flask_babel import gettext as _
 
 def build_msg(key, username, addr, port, secure):
     url_prefix = "https" if secure else "http"
--- build/pkgs/sagenb/src/sagenb/notebook/server_conf.py.orig	2017-06-02 16:24:20.000000000 -0600
+++ build/pkgs/sagenb/src/sagenb/notebook/server_conf.py	2018-06-15 16:10:52.238782641 -0600
@@ -8,7 +8,7 @@ from . import conf
 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, N_
-from flask.ext.babel import gettext, lazy_gettext
+from flask_babel import gettext, lazy_gettext
 _ = lazy_gettext
 
 defaults = {'word_wrap_cols':72,
--- build/pkgs/sagenb/src/sagenb/notebook/template.py.orig	2017-06-02 16:24:20.000000000 -0600
+++ build/pkgs/sagenb/src/sagenb/notebook/template.py	2018-06-15 16:10:52.238782641 -0600
@@ -21,7 +21,7 @@ import jinja2
 import os, re, sys
 
 from sagenb.misc.misc import SAGE_VERSION, DATA
-from flask.ext.babel import gettext, ngettext, lazy_gettext
+from flask_babel import gettext, ngettext, lazy_gettext
 from flask import current_app as app
 
 if 'SAGENB_TEMPLATE_PATH' in os.environ:
--- build/pkgs/sagenb/src/sagenb/notebook/tutorial.py.orig	2017-06-02 16:24:20.000000000 -0600
+++ build/pkgs/sagenb/src/sagenb/notebook/tutorial.py	2018-06-15 16:10:52.239782611 -0600
@@ -348,7 +348,7 @@ the "save" command), and get back to whe
 
 #####################################
 
-from flask.ext.babel import lazy_gettext as _
+from flask_babel import lazy_gettext as _
 
 notebook_help = [
     (_('Find Help and Documentation'),
--- build/pkgs/sagenb/src/sagenb/notebook/user_conf.py.orig	2017-06-02 16:24:20.000000000 -0600
+++ build/pkgs/sagenb/src/sagenb/notebook/user_conf.py	2018-06-15 16:10:52.239782611 -0600
@@ -8,7 +8,7 @@ from . import server_conf
 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 flask.ext.babel import lazy_gettext
+from flask_babel import lazy_gettext
 
 defaults = {'max_history_length':1000,
             'default_system':'sage',
--- build/pkgs/sagenb/src/sagenb/notebook/worksheet.py.orig	2017-06-02 16:24:20.000000000 -0600
+++ build/pkgs/sagenb/src/sagenb/notebook/worksheet.py	2018-06-15 16:10:52.248782346 -0600
@@ -57,7 +57,7 @@ from sagenb.misc.format import relocate_
 # Imports specifically relevant to the sage notebook
 from .cell import Cell, TextCell
 from .template import template, clean_name, prettify_time_ago
-from flask.ext.babel import gettext, lazy_gettext
+from flask_babel import gettext, lazy_gettext
 _ = gettext
 
 # Set some constants that will be used for regular expressions below.
@@ -4527,7 +4527,7 @@ def convert_time_to_string(t):
     Converts ``t`` (in Unix time) to a locale-specific string
     describing the time and date.
     """
-    from flask.ext.babel import format_datetime
+    from flask_babel import format_datetime
     import datetime, time
     try:
         return format_datetime(datetime.datetime.fromtimestamp(float(t)))