Kill off softspace completely (except in formatter.py which seems to have

a different feature with the same name).
The change to test_doctest.txt reduces the doctest failures to 3.

Author: gvanrossum

Include/ceval.h

@@ -40,8 +40,6 @@ PyAPI_FUNC(int) PyEval_GetRestricted(void);
  flag was set, else return 0. */
 PyAPI_FUNC(int) PyEval_MergeCompilerFlags(PyCompilerFlags*cf);
 
-PyAPI_FUNC(int) Py_FlushLine(void);
-
 PyAPI_FUNC(int) Py_AddPendingCall(int (*func)(void*), void*arg);
 PyAPI_FUNC(int) Py_MakePendingCalls(void);
 

Include/fileobject.h

@@ -13,7 +13,6 @@ typedef struct {
 PyObject*f_name;
 PyObject*f_mode;
 int (*f_close)(FILE*);
-intf_softspace;	/* Flag used by 'print' command */
 intf_binary; /* Flag which indicates whether the file is 
  open in binary (1) or text (0) mode */
 char*f_buf; /* Allocated readahead buffer */
@@ -41,7 +40,6 @@ PyAPI_FUNC(FILE *) PyFile_AsFile(PyObject *);
 PyAPI_FUNC(PyObject*) PyFile_Name(PyObject*);
 PyAPI_FUNC(PyObject*) PyFile_GetLine(PyObject*, int);
 PyAPI_FUNC(int) PyFile_WriteObject(PyObject*, PyObject*, int);
-PyAPI_FUNC(int) PyFile_SoftSpace(PyObject*, int);
 PyAPI_FUNC(int) PyFile_WriteString(constchar*, PyObject*);
 PyAPI_FUNC(int) PyObject_AsFileDescriptor(PyObject*);
 

Lib/StringIO.py

@@ -60,7 +60,6 @@ def __init__(self, buf = ''):
 self.buflist= []
 self.pos=0
 self.closed=False
-self.softspace=0
 
 def__iter__(self):
 returnself

Lib/bsddb/dbrecio.py

@@ -39,7 +39,6 @@ def __init__(self, db, key, txn=None):
 self.len=None
 self.pos=0
 self.closed=0
-self.softspace=0
 
 defclose(self):
 ifnotself.closed:

Lib/code.py

@@ -12,19 +12,6 @@
 __all__= ["InteractiveInterpreter", "InteractiveConsole", "interact",
 "compile_command"]
 
-defsoftspace(file, newvalue):
-oldvalue=0
-try:
-oldvalue=file.softspace
-exceptAttributeError:
-pass
-try:
-file.softspace=newvalue
-except (AttributeError, TypeError):
-# "attribute-less object" or "read-only attributes"
-pass
-returnoldvalue
-
 classInteractiveInterpreter:
 """Base class for InteractiveConsole.
 
@@ -105,9 +92,6 @@ def runcode(self, code):
 raise
 except:
 self.showtraceback()
-else:
-ifsoftspace(sys.stdout, 0):
-print()
 
 defshowsyntaxerror(self, filename=None):
 """Display the syntax error that just occurred.

Lib/doctest.py

@@ -240,16 +240,10 @@ def getvalue(self):
 # that a trailing newline is missing.
 ifresultandnotresult.endswith("\n"):
 result+="\n"
-# Prevent softspace from screwing up the next test case, in
-# case they used print with a trailing comma in an example.
-ifhasattr(self, "softspace"):
-delself.softspace
 returnresult
 
-deftruncate(self, size=None):
+deftruncate(self, size=None):
 StringIO.truncate(self, size)
-ifhasattr(self, "softspace"):
-delself.softspace
 
 # Worst-case linear-time ellipsis matching.
 def_ellipsis_match(want, got):

Lib/idlelib/PyShell.py

@@ -1223,7 +1223,6 @@ def resetoutput(self):
 self.text.insert("end-1c", "\n")
 self.text.mark_set("iomark", "end-1c")
 self.set_line_and_column()
-sys.stdout.softspace=0
 
 defwrite(self, s, tags=()):
 try:
@@ -1242,7 +1241,6 @@ class PseudoFile(object):
 def__init__(self, shell, tags, encoding=None):
 self.shell=shell
 self.tags=tags
-self.softspace=0
 self.encoding=encoding
 
 defwrite(self, s):

Lib/idlelib/run.py

@@ -190,12 +190,7 @@ def cleanup_traceback(tb, exclude):
 tb[i] =fn, ln, nm, line
 
 defflush_stdout():
-try:
-ifsys.stdout.softspace:
-sys.stdout.softspace=0
-sys.stdout.write("\n")
-except (AttributeError, EOFError):
-pass
+"""XXX How to do this now?"""
 
 defexit():
 """Exit subprocess, possibly after first deleting sys.exitfunc

Lib/socket.py

@@ -202,7 +202,7 @@ class _fileobject(object):
 default_bufsize=8192
 name="<socket>"
 
-__slots__= ["mode", "bufsize","softspace",
+__slots__= ["mode", "bufsize",
 # "closed" is a property, see below
 "_sock", "_rbufsize", "_wbufsize", "_rbuf", "_wbuf",
 "_close"]
@@ -213,7 +213,6 @@ def __init__(self, sock, mode='rb', bufsize=-1, close=False):
 ifbufsize<0:
 bufsize=self.default_bufsize
 self.bufsize=bufsize
-self.softspace=False
 ifbufsize==0:
 self._rbufsize=1
 elifbufsize==1:

Lib/test/test_doctest.txt

@@ -9,9 +9,9 @@ already:
 We can make this fail by disabling the blank-line feature.
 
  >>> if 1:
- ... print'a'
- ... print
- ... print'b'
+ ... print('a')
+ ... print()
+ ... print('b')
  a
  <BLANKLINE>
  b