Merge pull request #643 from ajdapretnar/deprec-warnings

Fix deprecation warnings
biolab · Apr 8, 2021 · 85faa90 · 85faa90
2 parents 4c4069b + 3c0caba
commit 85faa90
Show file tree

Hide file tree

Showing 10 changed files with 104 additions and 52 deletions.
diff --git a/orangecontrib/text/country_codes.py b/orangecontrib/text/country_codes.py
@@ -88,7 +88,6 @@
     'UA': ['UKR', 'Ukraine'],
 }
 
-
 CC_WORLD = {
     # Does NOT include CC_EUROPE
     '_1': ['Somaliland'],
@@ -148,7 +147,8 @@
     'KE': ['KEN', 'Kenya'],
     'KG': ['KGZ', 'Kyrgyzstan'],
     'KH': ['KHM', 'Cambodia'],
-    'KP': ['PRK', "Korea, Democratic People's Republic of", 'Dem. Rep. Korea', 'North Korea'],
+    'KP': ['PRK', "Korea, Democratic People's Republic of", 'Dem. Rep. Korea',
+           'North Korea'],
     'KR': ['KOR', 'Korea, Republic of', 'Korea', 'South Korea'],
     'KW': ['KWT', 'Kuwait'],
     'KZ': ['KAZ', 'Kazakhstan'],
@@ -214,7 +214,6 @@
     'ZW': ['ZWE', 'Zimbabwe'],
 }
 
-
 CC_USA = {
     'US-AK': ['AK', 'Alaska'],
     'US-AL': ['AL', 'Alabama'],
@@ -274,48 +273,88 @@
     'US-AK': ['Anchorage'],
     'US-AL': ['Birmingham', 'Montgomery', 'Mobile', 'Huntsville'],
     'US-AR': ['Little Rock'],
-    'US-AZ': ['Phoenix', 'Tucson', 'Mesa', 'Chandler', 'Gilbert', 'Glendale', 'Scottsdale', 'Tempe', 'Peoria', 'Surprise'],
-    'US-CA': ['Los Angeles', 'San Diego', 'San Jose', 'San Francisco', 'Fresno', 'Sacramento', 'Long Beach', 'Oakland', 'Bakersfield', 'Anaheim', 'Santa Ana', 'Riverside', 'Stockton', 'Chula Vista', 'Irvine', 'Fremont', 'San Bernardino', 'Modesto', 'Oxnard', 'Fontana', 'Moreno Valley', 'Huntington Beach', 'Glendale', 'Santa Clarita', 'Garden Grove', 'Oceanside', 'Rancho Cucamonga', 'Santa Rosa', 'Ontario', 'Elk Grove', 'Corona', 'Lancaster', 'Palmdale', 'Salinas', 'Hayward', 'Pomona', 'Escondido', 'Sunnyvale', 'Torrance', 'Pasadena', 'Orange', 'Fullerton', 'Thousand Oaks', 'Visalia', 'Roseville', 'Concord', 'Simi Valley', 'Santa Clara', 'Victorville', 'Vallejo', 'Berkeley', 'El Monte', 'Downey', 'Costa Mesa', 'Carlsbad', 'Inglewood', 'Fairfield', 'Ventura', 'Temecula', 'Antioch', 'Richmond', 'West Covina', 'Murrieta', 'Norwalk', 'Daly City', 'Burbank', 'Santa Maria', 'El Cajon', 'San Mateo', 'Rialto', 'Clovis', 'East Los Angeles'],
-    'US-CO': ['Denver', 'Colorado Springs', 'Aurora', 'Fort Collins', 'Lakewood', 'Thornton', 'Arvada', 'Westminster', 'Pueblo', 'Centennial', 'Boulder'],
+    'US-AZ': ['Phoenix', 'Tucson', 'Mesa', 'Chandler', 'Gilbert', 'Glendale',
+              'Scottsdale', 'Tempe', 'Peoria', 'Surprise'],
+    'US-CA': ['Los Angeles', 'San Diego', 'San Jose', 'San Francisco', 'Fresno',
+              'Sacramento', 'Long Beach', 'Oakland', 'Bakersfield', 'Anaheim',
+              'Santa Ana', 'Riverside', 'Stockton', 'Chula Vista', 'Irvine',
+              'Fremont', 'San Bernardino', 'Modesto', 'Oxnard', 'Fontana',
+              'Moreno Valley', 'Huntington Beach', 'Glendale', 'Santa Clarita',
+              'Garden Grove', 'Oceanside', 'Rancho Cucamonga', 'Santa Rosa',
+              'Ontario', 'Elk Grove', 'Corona', 'Lancaster', 'Palmdale',
+              'Salinas', 'Hayward', 'Pomona', 'Escondido', 'Sunnyvale',
+              'Torrance', 'Pasadena', 'Orange', 'Fullerton', 'Thousand Oaks',
+              'Visalia', 'Roseville', 'Concord', 'Simi Valley', 'Santa Clara',
+              'Victorville', 'Vallejo', 'Berkeley', 'El Monte', 'Downey',
+              'Costa Mesa', 'Carlsbad', 'Inglewood', 'Fairfield', 'Ventura',
+              'Temecula', 'Antioch', 'Richmond', 'West Covina', 'Murrieta',
+              'Norwalk', 'Daly City', 'Burbank', 'Santa Maria', 'El Cajon',
+              'San Mateo', 'Rialto', 'Clovis', 'East Los Angeles'],
+    'US-CO': ['Denver', 'Colorado Springs', 'Aurora', 'Fort Collins',
+              'Lakewood', 'Thornton', 'Arvada', 'Westminster', 'Pueblo',
+              'Centennial', 'Boulder'],
     'US-CT': ['Bridgeport', 'New Haven', 'Stamford', 'Hartford', 'Waterbury'],
     'US-DC': ['Washington'],
-    'US-FL': ['Jacksonville', 'Miami', 'Tampa', 'Orlando', 'St. Petersburg', 'Hialeah', 'Tallahassee', 'Fort Lauderdale', 'Port St. Lucie', 'Cape Coral', 'Pembroke Pines', 'Hollywood', 'Miramar', 'Gainesville', 'Coral Springs', 'Miami Gardens', 'Clearwater', 'Pompano Beach', 'Palm Bay', 'West Palm Beach', 'Lakeland', 'Brandon'],
-    'US-GA': ['Atlanta', 'Columbus', 'Augusta', 'Macon', 'Savannah', 'Athens', 'Sandy Springs'],
+    'US-FL': ['Jacksonville', 'Miami', 'Tampa', 'Orlando', 'St. Petersburg',
+              'Hialeah', 'Tallahassee', 'Fort Lauderdale', 'Port St. Lucie',
+              'Cape Coral', 'Pembroke Pines', 'Hollywood', 'Miramar',
+              'Gainesville', 'Coral Springs', 'Miami Gardens', 'Clearwater',
+              'Pompano Beach', 'Palm Bay', 'West Palm Beach', 'Lakeland',
+              'Brandon'],
+    'US-GA': ['Atlanta', 'Columbus', 'Augusta', 'Macon', 'Savannah', 'Athens',
+              'Sandy Springs'],
     'US-HI': ['Honolulu'],
     'US-IA': ['Des Moines', 'Cedar Rapids', 'Davenport'],
     'US-ID': ['Boise'],
-    'US-IL': ['Chicago', 'Aurora', 'Rockford', 'Joliet', 'Naperville', 'Springfield', 'Peoria', 'Elgin'],
+    'US-IL': ['Chicago', 'Aurora', 'Rockford', 'Joliet', 'Naperville',
+              'Springfield', 'Peoria', 'Elgin'],
     'US-IN': ['Indianapolis', 'Fort Wayne', 'Evansville', 'South Bend'],
     'US-KS': ['Wichita', 'Overland Park', 'Kansas City', 'Olathe', 'Topeka'],
     'US-KY': ['Louisville', 'Lexington'],
-    'US-LA': ['New Orleans', 'Baton Rouge', 'Shreveport', 'Lafayette', 'Metairie'],
+    'US-LA': ['New Orleans', 'Baton Rouge', 'Shreveport', 'Lafayette',
+              'Metairie'],
     'US-MA': ['Boston', 'Worcester', 'Springfield', 'Lowell', 'Cambridge'],
     'US-MD': ['Baltimore'],
-    'US-MI': ['Detroit', 'Grand Rapids', 'Warren', 'Sterling Heights', 'Ann Arbor', 'Lansing'],
+    'US-MI': ['Detroit', 'Grand Rapids', 'Warren', 'Sterling Heights',
+              'Ann Arbor', 'Lansing'],
     'US-MN': ['Minneapolis', 'St. Paul', 'Rochester'],
-    'US-MO': ['Kansas City', 'St. Louis', 'Springfield', 'Independence', 'Columbia'],
+    'US-MO': ['Kansas City', 'St. Louis', 'Springfield', 'Independence',
+              'Columbia'],
     'US-MS': ['Jackson'],
     'US-MT': ['Billings'],
-    'US-NC': ['Charlotte', 'Raleigh', 'Greensboro', 'Durham', 'Winston–Salem', 'Fayetteville', 'Cary', 'Wilmington', 'High Point'],
+    'US-NC': ['Charlotte', 'Raleigh', 'Greensboro', 'Durham', 'Winston–Salem',
+              'Fayetteville', 'Cary', 'Wilmington', 'High Point'],
     'US-ND': ['Fargo'],
     'US-NE': ['Omaha', 'Lincoln'],
     'US-NH': ['Manchester'],
     'US-NJ': ['Newark', 'Jersey City', 'Paterson', 'Elizabeth'],
     'US-NM': ['Albuquerque', 'Las Cruces'],
-    'US-NV': ['Las Vegas', 'Henderson', 'Reno', 'North Las Vegas', 'Paradise', 'Sunrise Manor', 'Spring Valley', 'Enterprise'],
+    'US-NV': ['Las Vegas', 'Henderson', 'Reno', 'North Las Vegas', 'Paradise',
+              'Sunrise Manor', 'Spring Valley', 'Enterprise'],
     'US-NY': ['New York City', 'Buffalo', 'Rochester', 'Yonkers', 'Syracuse'],
-    'US-OH': ['Columbus', 'Cleveland', 'Cincinnati', 'Toledo', 'Akron', 'Dayton'],
+    'US-OH': ['Columbus', 'Cleveland', 'Cincinnati', 'Toledo', 'Akron',
+              'Dayton'],
     'US-OK': ['Oklahoma City', 'Tulsa', 'Norman', 'Broken Arrow'],
     'US-OR': ['Portland', 'Salem', 'Eugene', 'Gresham'],
     'US-PA': ['Philadelphia', 'Pittsburgh', 'Allentown'],
     'US-RI': ['Providence'],
     'US-SC': ['Columbia', 'Charleston', 'North Charleston'],
     'US-SD': ['Sioux Falls'],
-    'US-TN': ['Memphis', 'Nashville', 'Knoxville', 'Chattanooga', 'Clarksville', 'Murfreesboro'],
-    'US-TX': ['Houston', 'San Antonio', 'Dallas', 'Austin', 'Fort Worth', 'El Paso', 'Arlington', 'Corpus Christi', 'Plano', 'Laredo', 'Lubbock', 'Garland', 'Irving', 'Amarillo', 'Grand Prairie', 'Brownsville', 'McKinney', 'Pasadena', 'Frisco', 'Mesquite', 'McAllen', 'Killeen', 'Waco', 'Carrollton', 'Denton', 'Midland', 'Abilene', 'Beaumont', 'Odessa', 'Round Rock', 'Richardson', 'Wichita Falls', 'College Station', 'Pearland', 'Lewisville', 'Tyler'],
+    'US-TN': ['Memphis', 'Nashville', 'Knoxville', 'Chattanooga', 'Clarksville',
+              'Murfreesboro'],
+    'US-TX': ['Houston', 'San Antonio', 'Dallas', 'Austin', 'Fort Worth',
+              'El Paso', 'Arlington', 'Corpus Christi', 'Plano', 'Laredo',
+              'Lubbock', 'Garland', 'Irving', 'Amarillo', 'Grand Prairie',
+              'Brownsville', 'McKinney', 'Pasadena', 'Frisco', 'Mesquite',
+              'McAllen', 'Killeen', 'Waco', 'Carrollton', 'Denton', 'Midland',
+              'Abilene', 'Beaumont', 'Odessa', 'Round Rock', 'Richardson',
+              'Wichita Falls', 'College Station', 'Pearland', 'Lewisville',
+              'Tyler'],
     'US-UT': ['Salt Lake City', 'West Valley City', 'Provo', 'West Jordan'],
-    'US-VA': ['Virginia Beach', 'Norfolk', 'Chesapeake', 'Richmond', 'Newport News', 'Alexandria', 'Hampton', 'Arlington County'],
-    'US-WA': ['Seattle', 'Spokane', 'Tacoma', 'Vancouver', 'Bellevue', 'Kent', 'Everett'],
+    'US-VA': ['Virginia Beach', 'Norfolk', 'Chesapeake', 'Richmond',
+              'Newport News', 'Alexandria', 'Hampton', 'Arlington County'],
+    'US-WA': ['Seattle', 'Spokane', 'Tacoma', 'Vancouver', 'Bellevue', 'Kent',
+              'Everett'],
     'US-WI': ['Milwaukee', 'Madison', 'Green Bay'],
 }
 
@@ -334,16 +373,20 @@
     'CH': ['Bern', 'Zürich', 'Geneva'],
     'CY': ['Nicosia'],
     'CZ': ['Prague', 'Praha', 'Praga'],
-    'DE': ['Berlin', 'Hanover', 'Hamburg', 'Munich', 'München', 'Stuttgart', 'Frankfurt', 'Düsseldorf', 'Cologne', 'Essen', 'Dresden', 'Leipzig'],
+    'DE': ['Berlin', 'Hanover', 'Hamburg', 'Munich', 'München', 'Stuttgart',
+           'Frankfurt', 'Düsseldorf', 'Cologne', 'Essen', 'Dresden', 'Leipzig'],
     'DK': ['Copenhagen', 'København'],
     'DZ': ['Algiers'],
     'EE': ['Tallinn'],
     'EG': ['Cairo'],
-    'ES': ['Madrid', 'Barcelona', 'Murcia', 'Malaga', 'Seville', 'Bilbao', 'Zaragoza', 'Valencia'],
+    'ES': ['Madrid', 'Barcelona', 'Murcia', 'Malaga', 'Seville', 'Bilbao',
+           'Zaragoza', 'Valencia'],
     'FI': ['Helsinki'],
     'FO': ['Tórshavn', 'Torshavn'],
-    'FR': ['Paris', 'Nice', 'Montpellier', 'Marseille', 'Lyon', 'Toulouse', 'Bordeaux', 'Nantes'],
-    'GB': ['London', 'London Heathrow', 'Manchester', 'Liverpool', 'Bristol', 'Cardiff', 'Oxford', 'Cambridge', 'Glasgow', 'Edinburgh', 'Belfast'],
+    'FR': ['Paris', 'Nice', 'Montpellier', 'Marseille', 'Lyon', 'Toulouse',
+           'Bordeaux', 'Nantes'],
+    'GB': ['London', 'London Heathrow', 'Manchester', 'Liverpool', 'Bristol',
+           'Cardiff', 'Oxford', 'Cambridge', 'Glasgow', 'Edinburgh', 'Belfast'],
     'GE': ['Tbilisi'],
     'GG': ['Saint Peter Port'],
     'GR': ['Athens', 'Thessaloniki'],
@@ -370,11 +413,14 @@
     'MT': ['Valletta'],
     'NL': ['Amsterdam', 'The Hague', 'Rotterdam'],
     'NO': ['Oslo', 'Bergen', 'Trondheim'],
-    'PL': ['Warsaw', 'Warszawa', 'Krakow', 'Lublin', 'Bialystok', 'Lodz', 'Gdansk', 'Wroclaw'],
+    'PL': ['Warsaw', 'Warszawa', 'Krakow', 'Lublin', 'Bialystok', 'Lodz',
+           'Gdansk', 'Wroclaw'],
     'PT': ['Lisbon', 'Porto'],
     'RO': ['Bucharest', 'București'],
     'RS': ['Belgrade', 'Beograd'],
-    'RU': ['Moscow', 'Moskva', 'Saint Petersburg', 'St. Petersburg', 'Kazan', 'Vladivostok', 'Irkutsk', 'Novosibirsk', 'Krasnoyarsk', 'Nizhny Novgorod'],
+    'RU': ['Moscow', 'Moskva', 'Saint Petersburg', 'St. Petersburg', 'Kazan',
+           'Vladivostok', 'Irkutsk', 'Novosibirsk', 'Krasnoyarsk',
+           'Nizhny Novgorod'],
     'SA': ['Riyadh'],
     'SE': ['Stockholm', 'Gothenburg', 'Malmo'],
     'SI': ['Ljubljana'],
@@ -386,7 +432,6 @@
     'UA': ['Kyiv', 'Kiev', 'Kharkiv', 'Odessa', 'Lviv'],
 }
 
-
 WORLD_CITIES = {
     # Capitals and larger cities. Does NOT include CC_EUROPE.
     '_1': ['Hargeisa'],
@@ -408,7 +453,8 @@
     'BT': ['Thimphu'],
     'BW': ['Gaborone'],
     'BZ': ['Belmopan'],
-    'CA': ['Ottawa', 'Vancouver', 'Calgary', 'Edmonton', 'Winnipeg', 'Toronto', 'Montreal', 'Québec', 'Quebec'],
+    'CA': ['Ottawa', 'Vancouver', 'Calgary', 'Edmonton', 'Winnipeg', 'Toronto',
+           'Montreal', 'Québec', 'Quebec'],
     'CD': ['Kinshasa'],
     'CF': ['Bangui'],
     'CG': ['Brazzaville'],
@@ -511,7 +557,6 @@
     'ZW': ['Harare'],
 }
 
-
 # Extend USA with US_CITIES
 for i in US_CITIES: CC_USA[i].extend(US_CITIES[i])
 

diff --git a/orangecontrib/text/import_documents.py b/orangecontrib/text/import_documents.py
@@ -83,7 +83,7 @@ def make_text_data(self):
         directory = pathlib.PurePath(self.path).parent
         category = directory.parts[-1] or "None"
         if self.replace_white_space:
-            self.content = re.sub('\s+', ' ', self.content)
+            self.content = re.sub(r'\s+', ' ', self.content)
         return TextData(name, self.path, self.ext, category, self.content)
 
 

diff --git a/orangecontrib/text/sentiment/__init__.py b/orangecontrib/text/sentiment/__init__.py
@@ -151,8 +151,8 @@ def __getitem__(self, language):
         return pos, neg
 
     def supported_languages(self):
-        re_pos = "positive_words_(.*)\.txt"
-        re_neg = "negative_words_(.*)\.txt"
+        re_pos = r"positive_words_(.*)\.txt"
+        re_neg = r"negative_words_(.*)\.txt"
         pos = neg = set()
         for i in self.lang_files:
             res_pos = re.fullmatch(re_pos, i[0])
@@ -212,7 +212,7 @@ def __getitem__(self, language):
         return filtering_dict
 
     def supported_languages(self):
-        regex = "SentiArt_(.*)\.pickle"
+        regex = r"SentiArt_(.*)\.pickle"
         supported_languages = set()
         for i in self.lang_files:
             res = re.fullmatch(regex, i[0])

diff --git a/orangecontrib/text/tests/test_bowvectorizer.py b/orangecontrib/text/tests/test_bowvectorizer.py
@@ -14,7 +14,7 @@ def test_transform(self):
 
         result = vect.transform(corpus)
         self.assertIsInstance(result, Corpus)
-        self.assertEqual(len(result.domain), 43)
+        self.assertEqual(len(result.domain.variables), 43)
 
     def test_binary(self):
         vect = BowVectorizer(wlocal=BowVectorizer.BINARY)

diff --git a/orangecontrib/text/tests/test_corpus.py b/orangecontrib/text/tests/test_corpus.py
@@ -31,13 +31,13 @@ def test_init_preserve_shape_of_empty_x(self):
     def test_corpus_from_file(self):
         c = Corpus.from_file('book-excerpts')
         self.assertEqual(len(c), 140)
-        self.assertEqual(len(c.domain), 1)
+        self.assertEqual(len(c.domain.variables), 1)
         self.assertEqual(len(c.domain.metas), 1)
         self.assertEqual(c.metas.shape, (140, 1))
 
         c = Corpus.from_file('deerwester')
         self.assertEqual(len(c), 9)
-        self.assertEqual(len(c.domain), 1)
+        self.assertEqual(len(c.domain.variables), 1)
         self.assertEqual(len(c.domain.metas), 1)
         self.assertEqual(c.metas.shape, (9, 1))
 

diff --git a/orangecontrib/text/tests/test_documentembedder.py b/orangecontrib/text/tests/test_documentembedder.py
@@ -51,7 +51,8 @@ def test_success_subset(self):
     def test_success_shapes(self):
         res, skipped = self.embedder(self.corpus)
         self.assertEqual(res.X.shape, (len(self.corpus), 2))
-        self.assertEqual(len(res.domain), len(self.corpus.domain) + 2)
+        self.assertEqual(len(res.domain.variables),
+                         len(self.corpus.domain.variables) + 2)
         self.assertIsNone(skipped)
 
     @patch(PATCH_METHOD, make_dummy_post(b''))

diff --git a/orangecontrib/text/tests/test_sentiment.py b/orangecontrib/text/tests/test_sentiment.py
@@ -14,8 +14,8 @@ def setUp(self):
     def test_transform(self):
         sentiment = self.method.transform(self.corpus)
         self.assertIsInstance(sentiment, Corpus)
-        self.assertEqual(len(sentiment.domain),
-                         len(self.corpus.domain) + self.new_cols)
+        self.assertEqual(len(sentiment.domain.variables),
+                         len(self.corpus.domain.variables) + self.new_cols)
 
     def test_copy(self):
         sentiment_t = self.method.transform(self.corpus)
@@ -43,8 +43,8 @@ def test_compute_values_to_different_domain(self):
     def test_empty_corpus(self):
         corpus = Corpus.from_file('deerwester')[:0]
         sentiment = self.method.transform(corpus)
-        self.assertEqual(len(sentiment.domain),
-                         len(self.corpus.domain) + self.new_cols)
+        self.assertEqual(len(sentiment.domain.variables),
+                         len(self.corpus.domain.variables) + self.new_cols)
         self.assertEqual(len(sentiment), 0)
 
 
@@ -57,8 +57,8 @@ def setUp(self):
     def test_transform(self):
         sentiment = self.method.transform(self.corpus)
         self.assertIsInstance(sentiment, Corpus)
-        self.assertEqual(len(sentiment.domain),
-                         len(self.corpus.domain) + self.new_cols)
+        self.assertEqual(len(sentiment.domain.variables),
+                         len(self.corpus.domain.variables) + self.new_cols)
 
     def test_copy(self):
         sentiment_t = self.method.transform(self.corpus)
@@ -74,8 +74,8 @@ def test_compute_values(self):
     def test_empty_corpus(self):
         corpus = self.corpus[:0]
         sentiment = self.method.transform(corpus)
-        self.assertEqual(len(sentiment.domain),
-                         len(self.corpus.domain) + self.new_cols)
+        self.assertEqual(len(sentiment.domain.variables),
+                         len(self.corpus.domain.variables) + self.new_cols)
         self.assertEqual(len(sentiment), 0)
 
 

diff --git a/orangecontrib/text/widgets/owdocmap.py b/orangecontrib/text/widgets/owdocmap.py
@@ -20,7 +20,7 @@
     CC_WORLD, INV_CC_WORLD, \
     CC_USA, INV_CC_USA, SET_CC_USA
 
-CC_NAMES = re.compile('[\w\s\.\-]+')
+CC_NAMES = re.compile(r'[\w\s\.\-]+')
 
 
 class Map:

diff --git a/orangecontrib/text/widgets/owpreprocess.py b/orangecontrib/text/widgets/owpreprocess.py
@@ -511,8 +511,8 @@ class FilteringModule(MultipleMethodModule):
     DEFAULT_METHODS = [Stopwords]
     DEFAULT_LANG = "English"
     DEFAULT_NONE = None
-    DEFAULT_PATTERN = "\.|,|:|;|!|\?|\(|\)|\||\+|\'|\"|‘|’|“|”|\'|" \
-                      "\’|…|\-|–|—|\$|&|\*|>|<|\/|\[|\]"
+    DEFAULT_PATTERN = r"\.|,|:|;|!|\?|\(|\)|\||\+|\'|\"|‘|’|“|”|\'|" \
+                      r"\’|…|\-|–|—|\$|&|\*|>|<|\/|\[|\]"
     DEFAULT_FREQ_TYPE = 0  # 0 - relative freq, 1 - absolute freq
     DEFAULT_REL_START, DEFAULT_REL_END, REL_MIN, REL_MAX = 0.1, 0.9, 0, 1
     DEFAULT_ABS_START, DEFAULT_ABS_END, ABS_MIN, ABS_MAX = 1, 10, 0, 10000

diff --git a/orangecontrib/text/widgets/tests/test_owsentimentanalysis.py b/orangecontrib/text/widgets/tests/test_owsentimentanalysis.py
@@ -30,22 +30,27 @@ def test_output(self):
 
         # test default settings
         out_corpus = self.get_output(self.widget.Outputs.corpus)
-        self.assertEqual(len(out_corpus.domain), len(self.corpus.domain) + 4)
+        self.assertEqual(len(out_corpus.domain.variables),
+                         len(self.corpus.domain.variables) + 4)
 
         # test multisentiment
         self.widget.multi_sent.click()
         out_corpus = self.get_output(self.widget.Outputs.corpus)
-        self.assertEqual(len(out_corpus.domain), len(self.corpus.domain) + 1)
+        self.assertEqual(len(out_corpus.domain.variables),
+                         len(self.corpus.domain.variables) + 1)
 
         # test SentiArt
         self.widget.senti_art.click()
         out_corpus = self.get_output(self.widget.Outputs.corpus)
-        self.assertEqual(len(out_corpus.domain), len(self.corpus.domain) + 7)
+        self.assertEqual(len(out_corpus.domain.variables),
+                         len(self.corpus.domain.variables)
+                         + 7)
 
         # test liu hu
         self.widget.liu_hu.click()
         out_corpus = self.get_output(self.widget.Outputs.corpus)
-        self.assertEqual(len(out_corpus.domain), len(self.corpus.domain) + 1)
+        self.assertEqual(len(out_corpus.domain.variables),
+                         len(self.corpus.domain.variables) + 1)
 
         # test custom files
         self.widget.pos_file = os.path.join(os.path.dirname(__file__),
@@ -54,7 +59,8 @@ def test_output(self):
                                             "data/sentiment/neg.txt")
         self.widget.custom_list.click()
         out_corpus = self.get_output(self.widget.Outputs.corpus)
-        self.assertEqual(len(out_corpus.domain), len(self.corpus.domain) + 1)
+        self.assertEqual(len(out_corpus.domain.variables),
+                         len(self.corpus.domain.variables) + 1)
         res = np.array([[12.5], [10], [16.66666667], [12.5], [11.11111111],
                         [-14.28571429], [0], [-10], [0]])
         np.testing.assert_array_almost_equal(out_corpus.X, res, decimal=8)