Skip to content

Commit

Permalink
Merge pull request ipython#2638 from asmeurer/mac-py3-paste
Browse files Browse the repository at this point in the history
Fix %paste in Python 3 on Mac
  • Loading branch information
takluyver committed Dec 2, 2012
2 parents a7cc583 + a8a0f16 commit 47cc489
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion IPython/lib/clipboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def osx_clipboard_get():
stdout=subprocess.PIPE)
text, stderr = p.communicate()
# Text comes in with old Mac \r line endings. Change them to \n.
text = text.replace('\r', '\n')
text = text.replace(b'\r', b'\n')
text = py3compat.cast_unicode(text, py3compat.DEFAULT_ENCODING)
return text

Expand Down

0 comments on commit 47cc489

Please sign in to comment.