diff --git a/orangecontrib/text/nyt.py b/orangecontrib/text/nyt.py index 89e41aa11..069747ed6 100644 --- a/orangecontrib/text/nyt.py +++ b/orangecontrib/text/nyt.py @@ -11,9 +11,13 @@ from Orange import data -from Orange.canvas.utils import environ from orangecontrib.text.corpus import Corpus +try: + from Orange.misc import environ +except ImportError: + from Orange.canvas.utils import environ + SLEEP = 1 TIMEOUT = 10 MAX_DOCS = 1000 @@ -131,7 +135,7 @@ def search(self, query, date_from=None, date_to=None, max_docs=None, def _cache_init(self): """ Initialize cache in Orange environment buffer dir. """ - path = os.path.join(environ.buffer_dir, "nytcache") + path = os.path.join(environ.cache_dir(), "nytcache") try: if not os.path.exists(path): os.makedirs(path) diff --git a/orangecontrib/text/pubmed.py b/orangecontrib/text/pubmed.py index 0f3c7b010..f203439a3 100644 --- a/orangecontrib/text/pubmed.py +++ b/orangecontrib/text/pubmed.py @@ -8,7 +8,11 @@ from Bio import Medline from validate_email import validate_email -from Orange.canvas.utils import environ +try: + from Orange.misc import environ +except ImportError: + from Orange.canvas.utils import environ + from Orange.data import StringVariable, DiscreteVariable, TimeVariable, Domain from orangecontrib.text.corpus import Corpus @@ -184,7 +188,7 @@ def __init__(self, email, progress_callback=None, error_callback=None): self.stop_signal = False self.cache_path = None - cache_folder = os.path.join(environ.buffer_dir, 'pubmedcache') + cache_folder = os.path.join(environ.cache_dir(), 'pubmedcache') if not os.path.exists(cache_folder): os.makedirs(cache_folder) diff --git a/orangecontrib/text/widgets/owimportdocuments.py b/orangecontrib/text/widgets/owimportdocuments.py index e4d67727e..1df27390d 100644 --- a/orangecontrib/text/widgets/owimportdocuments.py +++ b/orangecontrib/text/widgets/owimportdocuments.py @@ -33,7 +33,11 @@ from orangecontrib.text.corpus import Corpus from orangecontrib.text.import_documents import ImportDocuments -from Orange.canvas.preview.previewbrowser import TextLabel + +try: + from orangecanvas.preview.previewbrowser import TextLabel +except ImportError: + from Orange.canvas.preview.previewbrowser import TextLabel def prettifypath(path): diff --git a/orangecontrib/text/widgets/ownyt.py b/orangecontrib/text/widgets/ownyt.py index 317bd4251..b1da6fbf6 100644 --- a/orangecontrib/text/widgets/ownyt.py +++ b/orangecontrib/text/widgets/ownyt.py @@ -6,12 +6,17 @@ from Orange.data import StringVariable from Orange.widgets.credentials import CredentialManager from Orange.widgets.settings import Setting -from Orange.widgets.widget import OWWidget, Msg, gui, Output +from Orange.widgets.widget import OWWidget, Msg, Output from orangecontrib.text.corpus import Corpus from orangecontrib.text.nyt import NYT, MIN_DATE from orangecontrib.text.widgets.utils import CheckListLayout, DatePickerInterval, QueryBox, \ gui_require, asynchronous +try: + from orangewidget import gui +except ImportError: + from Orange.canvas.widgets.widget import gui + class OWNYT(OWWidget): class APICredentialsDialog(OWWidget):