Skip to content

Commit 958fba2

Browse files
Merge pull request #66 from DanielGoldfarb/master
check inputs are float, and avoid "Image" confusion (IPython.display vs. PIL).
2 parents a10a5e2 + fa5ea61 commit 958fba2

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

examples/savefig.ipynb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"metadata": {},
7878
"outputs": [],
7979
"source": [
80-
"from IPython.display import Image"
80+
"import IPython.display as IPydisplay"
8181
]
8282
},
8383
{
@@ -89,7 +89,7 @@
8989
"name": "stdout",
9090
"output_type": "stream",
9191
"text": [
92-
"-rw-rw-rw- 1 dino dino 14697 Mar 3 21:17 \u001b[0m\u001b[01;35mtestsave.png\u001b[0m\r\n"
92+
"-rw-rw-rw- 1 dino dino 14697 Mar 23 20:02 \u001b[0m\u001b[01;35mtestsave.png\u001b[0m\r\n"
9393
]
9494
},
9595
{
@@ -106,7 +106,7 @@
106106
],
107107
"source": [
108108
"%ls -l testsave.png\n",
109-
"Image(filename='testsave.png')"
109+
"IPydisplay.Image(filename='testsave.png')"
110110
]
111111
},
112112
{
@@ -157,7 +157,7 @@
157157
}
158158
],
159159
"source": [
160-
"Image(buf.read())"
160+
"IPydisplay.Image(buf.read())"
161161
]
162162
},
163163
{
@@ -198,8 +198,8 @@
198198
"name": "stdout",
199199
"output_type": "stream",
200200
"text": [
201-
"-rw-rw-rw- 1 dino dino 12287 Mar 3 21:17 \u001b[0m\u001b[01;35mtsave30.jpg\u001b[0m\n",
202-
"-rw-rw-rw- 1 dino dino 59840 Mar 3 21:17 \u001b[0m\u001b[01;35mtsave100.jpg\u001b[0m\n"
201+
"-rw-rw-rw- 1 dino dino 12287 Mar 23 20:02 \u001b[0m\u001b[01;35mtsave30.jpg\u001b[0m\n",
202+
"-rw-rw-rw- 1 dino dino 59840 Mar 23 20:02 \u001b[0m\u001b[01;35mtsave100.jpg\u001b[0m\n"
203203
]
204204
},
205205
{
@@ -228,8 +228,8 @@
228228
"source": [
229229
"%ls -l tsave30.jpg\n",
230230
"%ls -l tsave100.jpg\n",
231-
"Image(filename='tsave30.jpg')\n",
232-
"Image(filename='tsave100.jpg')"
231+
"IPydisplay.Image(filename='tsave30.jpg')\n",
232+
"IPydisplay.Image(filename='tsave100.jpg')"
233233
]
234234
},
235235
{
@@ -279,7 +279,7 @@
279279
],
280280
"source": [
281281
"_ = buf30dpi.seek(0)\n",
282-
"Image(buf30dpi.read())"
282+
"IPydisplay.Image(buf30dpi.read())"
283283
]
284284
},
285285
{
@@ -301,7 +301,7 @@
301301
],
302302
"source": [
303303
"_ = buf100dpi.seek(0)\n",
304-
"Image(buf100dpi.read())"
304+
"IPydisplay.Image(buf100dpi.read())"
305305
]
306306
},
307307
{

src/mplfinance/_arg_validators.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,23 @@ def _check_and_prepare_data(data):
2525
if not isinstance(data.index,pd.core.indexes.datetimes.DatetimeIndex):
2626
raise TypeError('Expect data.index as DatetimeIndex')
2727

28+
cols = ['Open','High','Low','Close']
29+
2830
dates = mdates.date2num(data.index.to_pydatetime())
2931
opens = data['Open'].values
3032
highs = data['High'].values
3133
lows = data['Low'].values
3234
closes = data['Close'].values
3335
if 'Volume' in data.columns:
3436
volumes = data['Volume'].values
37+
cols.append('Volume')
3538
else:
3639
volumes = None
3740

41+
for col in cols:
42+
if not all( isinstance(v,(float,int)) for v in data[col] ):
43+
raise ValueError('Data for column "'+str(col)+'" must be ALL float or int.')
44+
3845
return dates, opens, highs, lows, closes, volumes
3946

4047

0 commit comments

Comments
 (0)