Skip to content

Commit 975a4b9

Browse files
committed
[*] Fixed a PR-remarks.
1 parent c158362 commit 975a4b9

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

pandas_datareader/moex.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import pandas as pd
44

55
from pandas_datareader.base import _DailyBaseReader
6-
from pandas_datareader.compat import StringIO, binary_type, concat, is_list_like, PY3
6+
from pandas_datareader.compat import StringIO, binary_type, concat, is_list_like
77

88

99
class MoexReader(_DailyBaseReader):
@@ -69,7 +69,8 @@ def url(self):
6969
return [
7070
self.__url_data.format(
7171
engine=engine, market=market, symbol=s
72-
) for s in self.symbols if s in self.__markets_n_engines for market, engine in self.__markets_n_engines[s]
72+
) for s in self.symbols if s in self.__markets_n_engines
73+
for market, engine in self.__markets_n_engines[s]
7374
]
7475

7576
def _get_params(self, start):
@@ -181,17 +182,16 @@ def read(self):
181182
break
182183

183184
if len(out_list) > 0:
184-
if PY3:
185-
str_io = StringIO("\r\n".join(out_list))
186-
else:
187-
str_io = StringIO("\r\n".join(out_list).encode('utf-8'))
188-
185+
str_io = StringIO("\r\n".join(out_list))
189186
dfs.append(self._read_lines(str_io)) # add a new DataFrame
190187
finally:
191188
self.close()
192189

193190
if len(dfs) == 0:
194-
raise IOError("{} returned no data; check URL for invalid or correct a date interval".format(self.__class__.__name__))
191+
raise IOError(
192+
"{} returned no data; "
193+
"check URL or correct a date".format(self.__class__.__name__)
194+
)
195195
elif len(dfs) > 1:
196196
return concat(dfs, axis=0, join="outer", sort=True)
197197
else:

0 commit comments

Comments
 (0)