|
3 | 3 | import pandas as pd |
4 | 4 |
|
5 | 5 | 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 |
7 | 7 |
|
8 | 8 |
|
9 | 9 | class MoexReader(_DailyBaseReader): |
@@ -69,7 +69,8 @@ def url(self): |
69 | 69 | return [ |
70 | 70 | self.__url_data.format( |
71 | 71 | 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] |
73 | 74 | ] |
74 | 75 |
|
75 | 76 | def _get_params(self, start): |
@@ -181,17 +182,16 @@ def read(self): |
181 | 182 | break |
182 | 183 |
|
183 | 184 | 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)) |
189 | 186 | dfs.append(self._read_lines(str_io)) # add a new DataFrame |
190 | 187 | finally: |
191 | 188 | self.close() |
192 | 189 |
|
193 | 190 | 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 | + ) |
195 | 195 | elif len(dfs) > 1: |
196 | 196 | return concat(dfs, axis=0, join="outer", sort=True) |
197 | 197 | else: |
|
0 commit comments