25 lines
773 B
Plaintext
25 lines
773 B
Plaintext
$OpenBSD: patch-IPython_iplib_py,v 1.4 2008/12/27 15:29:55 fgsch Exp $
|
|
--- IPython/iplib.py.orig Sat Aug 23 17:37:28 2008
|
|
+++ IPython/iplib.py Mon Dec 15 03:12:11 2008
|
|
@@ -56,7 +56,10 @@ import traceback
|
|
import types
|
|
import warnings
|
|
warnings.filterwarnings('ignore', r'.*sets module*')
|
|
-from sets import Set
|
|
+try:
|
|
+ set
|
|
+except NameError:
|
|
+ from sets import Set as set
|
|
from pprint import pprint, pformat
|
|
|
|
# IPython's own modules
|
|
@@ -1857,7 +1860,7 @@ want to merge them back into the new files.""" % local
|
|
"""
|
|
line = fn + " " + rest
|
|
|
|
- done = Set()
|
|
+ done = set()
|
|
while 1:
|
|
pre,fn,rest = prefilter.splitUserInput(line,
|
|
prefilter.shell_line_split)
|