Skip to content
Snippets Groups Projects
Commit 91c3454e8124 authored by jfp's avatar jfp
Browse files

Python3 fix

parent 8239bf464f94
No related branches found
No related tags found
No related merge requests found
......@@ -105,8 +105,8 @@
self._segment = {}
self._load_segments(database, table)
self._map = None
if database and database.caches().has_key(self.index_name):
if database and self.index_name in database.caches():
self._cache = database.cache(self.index_name)
self._cache.set_cached_object(self)
else:
self._cache = None
......@@ -109,9 +109,9 @@
self._cache = database.cache(self.index_name)
self._cache.set_cached_object(self)
else:
self._cache = None
if database and database.analyze_indexes().has_key(self.index_name):
if database and self.index_name in database.analyze_indexes():
self._analyze_index = database.analyze_index(self.index_name)
self._analyze_index.set_index(self)
else:
self._analyze_index = None
......@@ -114,8 +114,8 @@
self._analyze_index = database.analyze_index(self.index_name)
self._analyze_index.set_index(self)
else:
self._analyze_index = None
if database and database.analyze_placements().has_key(self.index_name):
if database and self.index_name in database.analyze_placements():
self._analyze_placement = database.analyze_placement(
self.index_name
)
......
......@@ -42,11 +42,9 @@
else:
self._area = area_name
if self.index_id:
if database and database.analyze_logical_areas_by_id().has_key(
self.index_id
):
if database and self.index_id in database.analyze_logical_areas_by_id():
self._partition_index_analyze = (
database.analyze_logical_area_by_id(self.index_id)
)
else:
self._partition_index_analyze = None
......@@ -48,14 +46,12 @@
self._partition_index_analyze = (
database.analyze_logical_area_by_id(self.index_id)
)
else:
self._partition_index_analyze = None
if database and database.analyze_logical_areas_by_id().has_key(
self.storage_id
):
if database and self.storage_id in database.analyze_logical_areas_by_id():
self._system_record_analyze = (
database.analyze_logical_area_by_id(self.storage_id)
)
else:
self._system_record_analyze = None
elif database:
......@@ -56,10 +52,10 @@
self._system_record_analyze = (
database.analyze_logical_area_by_id(self.storage_id)
)
else:
self._system_record_analyze = None
elif database:
if database.analyze_logical_areas_by_id().has_key(self.storage_id):
if self.storage_id in database.analyze_logical_areas_by_id():
self._partition_analyze = database.analyze_logical_area_by_id(
self.storage_id
)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment