Skip to content

Commit dd57ae3

Browse files
Ajay SaxenaAjay Saxena
Ajay Saxena
authored and
Ajay Saxena
committed
code review changes and read clipboard invalid encoding test
1 parent 71d58d0 commit dd57ae3

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

pandas/io/clipboard.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ def read_clipboard(**kwargs): # pragma: no cover
1414
-------
1515
parsed : DataFrame
1616
"""
17+
encoding = kwargs.pop('encoding','utf-8')
18+
19+
#testing if an invalid encoding is passed to clipboard
20+
if encoding is not None and encoding.lower().replace('-','') != 'utf8':
21+
raise NotImplementedError('reading from clipboard only supports utf-8 encoding')
22+
1723
from pandas.util.clipboard import clipboard_get
1824
from pandas.io.parsers import read_table
1925
text = clipboard_get()
@@ -74,10 +80,10 @@ def to_clipboard(obj, excel=None, sep=None, **kwargs): # pragma: no cover
7480
- Windows:
7581
- OS X:
7682
"""
77-
encoding = kwargs.get('encoding')
83+
encoding = kwargs.pop('encoding','utf-8')
7884

7985
#testing if an invalid encoding is passed to clipboard
80-
if encoding is not None and encoding is not 'utf-8':
86+
if encoding is not None and encoding.lower().replace('-','') != 'utf8':
8187
raise ValueError('clipboard only supports utf-8 encoding')
8288

8389
from pandas.util.clipboard import clipboard_set

pandas/io/tests/test_clipboard.py

+2
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ def test_invalid_encoding(self):
122122
data = self.data['string']
123123
with tm.assertRaises(ValueError):
124124
data.to_clipboard(encoding='ascii')
125+
with tm.assertRaises(NotImplementedError):
126+
pd.read_clipboard(encoding='ascii')
125127

126128

127129

0 commit comments

Comments
 (0)