]> granicus.if.org Git - python/commitdiff
merge 3.4 (#23093)
authorBenjamin Peterson <benjamin@python.org>
Mon, 22 Dec 2014 03:00:51 +0000 (21:00 -0600)
committerBenjamin Peterson <benjamin@python.org>
Mon, 22 Dec 2014 03:00:51 +0000 (21:00 -0600)
1  2 
Lib/_pyio.py
Lib/test/test_io.py
Misc/NEWS
Modules/_io/bufferedio.c
Modules/_io/textio.c

diff --cc Lib/_pyio.py
index d507cfed35da3b23c51dc6a337eb65d070a7abe9,01683f8285945e12911d0e7e4b20c17b728b6c08..36146449375d136f28401d27d32dec0d4df80f09
@@@ -808,14 -790,13 +808,14 @@@ class _BufferedIOMixin(BufferedIOBase)
                          .format(self.__class__.__name__))
  
      def __repr__(self):
 -        clsname = self.__class__.__name__
 +        modname = self.__class__.__module__
 +        clsname = self.__class__.__qualname__
          try:
              name = self.name
-         except AttributeError:
+         except Exception:
 -            return "<_pyio.{0}>".format(clsname)
 +            return "<{}.{}>".format(modname, clsname)
          else:
 -            return "<_pyio.{0} name={1!r}>".format(clsname, name)
 +            return "<{}.{} name={!r}>".format(modname, clsname, name)
  
      ### Lower-level APIs ###
  
@@@ -1636,11 -1558,10 +1636,11 @@@ class TextIOWrapper(TextIOBase)
      #   - "chars_..." for integer variables that count decoded characters
  
      def __repr__(self):
 -        result = "<_pyio.TextIOWrapper"
 +        result = "<{}.{}".format(self.__class__.__module__,
 +                                 self.__class__.__qualname__)
          try:
              name = self.name
-         except AttributeError:
+         except Exception:
              pass
          else:
              result += " name={0!r}".format(name)
Simple merge
diff --cc Misc/NEWS
index d3b1c88bf307ac0bfd34b6c43e3ef712b432da7e,958f28579dc14cffee5201d18e2f2743f9661540..f7b0a29c085bc89ed850b4f252c79fe857fcca7a
+++ b/Misc/NEWS
@@@ -196,9 -41,9 +196,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #23093: In the io, module allow more operations to work on detached
+   streams.
 +- Issue #22585: On OpenBSD 5.6 and newer, os.urandom() now calls getentropy(),
 +  instead of reading /dev/urandom, to get pseudo-random bytes.
 +
  - Issue #19104: pprint now produces evaluable output for wrapped strings.
  
  - Issue #23071: Added missing names to codecs.__all__.  Patch by Martin Panter.
Simple merge
Simple merge