From 29e7604fb84a107b3e2ba4b6a4cd18a363061df8 Mon Sep 17 00:00:00 2001 From: josw123 Date: Mon, 7 Sep 2020 10:48:55 +0900 Subject: [PATCH] Fix warnings(#35) --- dart_fss/fs/fs.py | 11 ++++++++--- dart_fss/xbrl/dart_xbrl.py | 2 ++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dart_fss/fs/fs.py b/dart_fss/fs/fs.py index 1a2b59c..54573f2 100644 --- a/dart_fss/fs/fs.py +++ b/dart_fss/fs/fs.py @@ -1,7 +1,7 @@ import pandas as pd from pandas import DataFrame -from typing import Dict +from typing import Dict, Optional from dart_fss.utils import dict_to_html, create_folder @@ -42,7 +42,7 @@ def separator(self, separator): pd.options.display.float_format = '{:}'.format self.info['separator'] = separator - def show(self, tp, show_class: bool = True, show_depth: int = 10, show_concept: bool = True) -> DataFrame: + def show(self, tp, show_class: bool = True, show_depth: int = 10, show_concept: bool = True) -> Optional[DataFrame]: """ 재무제표 정보를 표시해주는 Method @@ -75,6 +75,8 @@ class 표시 여부 for column in columns: if column not in class_columns: ncolumns.append(column) + if len(ncolumns) > 0: + ncolumns = pd.MultiIndex.from_tuples(ncolumns) df = df[ncolumns] else: drop_rows = [] @@ -88,7 +90,8 @@ class 표시 여부 for column in columns: if column not in class_columns[show_depth + 1:]: ncolumns.append(column) - + if len(ncolumns) > 0: + ncolumns = pd.MultiIndex.from_tuples(ncolumns) df = df[ncolumns].drop(drop_rows) if show_concept is False: @@ -99,6 +102,8 @@ class 표시 여부 for column in columns: if column not in concept_colmuns: ncolumns.append(column) + if len(ncolumns) > 0: + ncolumns = pd.MultiIndex.from_tuples(ncolumns) df = df[ncolumns] return df diff --git a/dart_fss/xbrl/dart_xbrl.py b/dart_fss/xbrl/dart_xbrl.py index 3d64bb7..828ba93 100644 --- a/dart_fss/xbrl/dart_xbrl.py +++ b/dart_fss/xbrl/dart_xbrl.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- import re +import pandas as pd from typing import List, Union from pandas import DataFrame @@ -124,6 +125,7 @@ def get_period_information(self, lang: str = 'ko') -> DataFrame: data = df[df.columns[2:]].iloc[3] data_set = [(key, data[key]) for key in data.keys()] new_columns = list(df.columns[:2]) + [data[0] for data in sorted(data_set, key=lambda x: x[1], reverse=True)] + new_columns = pd.MultiIndex.from_tuples(new_columns) return df[new_columns] def get_audit_information(self, lang: str = 'ko') -> DataFrame: