The fix for this still doesn't set Content-Length to zero when body is None, but I don't see any reason why this should be the case. For example, the following snippet would work for any 'empty' body:

if 'content-length' not in header_names:
    self._set_content_length(body if body is not None else '')

I'm happy to produce a patch if there's any chance it would be merged.