Skip to content
Snippets Groups Projects
Commit ecd08f6d authored by Adam Laskowski's avatar Adam Laskowski
Browse files

SSDM-13300: Reformatted code, switched usage of deprecated iteritems() to items() in Things class

parent 6b274e21
No related branches found
No related tags found
1 merge request!40SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# #
from tabulate import tabulate
from pandas import DataFrame, Series
import pandas as pd import pandas as pd
from pandas import DataFrame
from tabulate import tabulate
class Things: class Things:
...@@ -38,20 +38,20 @@ class Things: ...@@ -38,20 +38,20 @@ class Things:
""" """
def __init__( def __init__(
self, self,
openbis_obj, openbis_obj,
entity, entity,
identifier_name="code", identifier_name="code",
additional_identifier=None, additional_identifier=None,
start_with=None, start_with=None,
count=None, count=None,
totalCount=None, totalCount=None,
single_item_method=None, single_item_method=None,
response=None, response=None,
df_initializer=None, df_initializer=None,
objects_initializer=None, objects_initializer=None,
attrs=None, attrs=None,
props=None, props=None,
): ):
self.openbis = openbis_obj self.openbis = openbis_obj
self.entity = entity self.entity = entity
...@@ -251,8 +251,5 @@ class Things: ...@@ -251,8 +251,5 @@ class Things:
get_item = getattr(self.openbis, "get_" + self.entity) get_item = getattr(self.openbis, "get_" + self.entity)
for item in self.df[[self.identifier_name]][ for item in self.df[[self.identifier_name]][
self.identifier_name self.identifier_name
].iteritems(): ].items():
yield get_item(item[1]) yield get_item(item[1])
# yield getattr(self.openbis, 'get_' + self.entity)(item[1])
# return self.df[[self.identifier_name]].to_dict()[self.identifier_name]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment