* make_stream_binary is now public for reuse. (Robert Collins)

* NAME was not defined in the protocol BNF. (Robert Collins)

diff --git a/NEWS b/NEWS
index 93c87cc64107f99193e69674cf52edb72dc18fe1..045760721056d68a83b3cf3baa6e60015d84966f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,10 @@ NEXT (In development)
 BUG FIXES
 ~~~~~~~~~
 
+* make_stream_binary is now public for reuse. (Robert Collins)
+
+* NAME was not defined in the protocol BNF. (Robert Collins)
+
 * UnsupportedOperation is available in the Python2.6 io library, so ask
   forgiveness rather than permission for obtaining it. (Robert Collins)
 

diff --git a/README b/README
index 103a32cdf9bb4791eb0a60ce0711f47cafb35c24..e3971957eb2f78b7e4815b49d414916d59ff8183 100644 (file)
--- a/README
+++ b/README
@@ -163,6 +163,7 @@ tags: [-]TAG ...
 time: YYYY-MM-DD HH:MM:SSZ
 
 LABEL: UTF8*
+NAME: UTF8*
 DETAILS ::= BRACKETED | MULTIPART
 BRACKETED ::= '[' CR UTF8-lines ']' CR
 MULTIPART ::= '[ multipart' CR PART* ']' CR

diff --git a/python/subunit/__init__.py b/python/subunit/__init__.py
index dfc5e9498b3709c88ec891dbf07e6c860ce4fc0a..f870904a5eaed3dda511770c5dbf459c84d00a72 100644 (file)
--- a/python/subunit/__init__.py
+++ b/python/subunit/__init__.py
@@ -624,7 +624,7 @@ class TestProtocolClient(testresult.TestResult):
 
     def __init__(self, stream):
         testresult.TestResult.__init__(self)
-        stream = _make_stream_binary(stream)
+        stream = make_stream_binary(stream)
         self._stream = stream
         self._progress_fmt = _b("progress: ")
         self._bytes_eol = _b("\n")
@@ -921,7 +921,7 @@ class ExecTestCase(unittest.TestCase):
         protocol = TestProtocolServer(result)
         process = subprocess.Popen(self.script, shell=True,
             stdout=subprocess.PIPE)
-        _make_stream_binary(process.stdout)
+        make_stream_binary(process.stdout)
         output = process.communicate()[0]
         protocol.readFrom(BytesIO(output))
 
@@ -1177,11 +1177,11 @@ class ProtocolTestCase(object):
         :param forward: A stream to pass subunit input on to. If not supplied
             subunit input is not forwarded.
         """
-        stream = _make_stream_binary(stream)
+        stream = make_stream_binary(stream)
         self._stream = stream
         self._passthrough = passthrough
         if forward is not None:
-            forward = _make_stream_binary(forward)
+            forward = make_stream_binary(forward)
         self._forward = forward
 
     def __call__(self, result=None):
@@ -1277,7 +1277,7 @@ def read_test_list(path):
         f.close()
 
 
-def _make_stream_binary(stream):
+def make_stream_binary(stream):
     """Ensure that a stream will be binary safe. See _make_binary_on_windows.
     
     :return: A binary version of the same stream (some streams cannot be