Merge pull request #270 from foosel/fix/deprecated_flask_imports

Fix use of deprecated flask.ext imports
fabianonline · Aug 1, 2020 · d8ef9da · d8ef9da
2 parents a5b3bca + ddcfc0a
commit d8ef9da
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/octoprint_telegram/__init__.py b/octoprint_telegram/__init__.py
@@ -3,8 +3,8 @@
 from subprocess import Popen, PIPE
 import threading, requests, re, time, datetime, StringIO, json, random, logging, traceback, io, collections, os, flask,base64,PIL, pkg_resources,subprocess,zipfile,glob #,resource
 import octoprint.plugin, octoprint.util, octoprint.filemanager
-from flask.ext.babel import gettext
-from flask.ext.login import current_user
+from flask_babel import gettext
+from flask_login import current_user
 from .telegramCommands import TCMD # telegramCommands.
 from .telegramNotifications import TMSG # telegramNotifications
 from .telegramNotifications import telegramMsgDict # dict of known notification messages

diff --git a/octoprint_telegram/telegramCommands.py b/octoprint_telegram/telegramCommands.py
@@ -2,7 +2,7 @@
 import logging, sarge, hashlib, datetime, time, operator, socket
 import octoprint.filemanager
 import requests
-from flask.ext.babel import gettext
+from flask_babel import gettext
 from .telegramNotifications import telegramMsgDict
 
 ################################################################################################################

diff --git a/octoprint_telegram/telegramNotifications.py b/octoprint_telegram/telegramNotifications.py
@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 import time, datetime, logging
 import octoprint.util
-from flask.ext.babel import gettext
+from flask_babel import gettext
 
 ###################################################################################################
 # Here you find the known notification messages and their handles.