Last active
May 4, 2016 16:47
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# This is free and unencumbered software released into the public domain. | |
# | |
# Anyone is free to copy, modify, publish, use, compile, sell, or | |
# distribute this software, either in source code form or as a compiled | |
# binary, for any purpose, commercial or non-commercial, and by any | |
# means. | |
# | |
# In jurisdictions that recognize copyright laws, the author or authors | |
# of this software dedicate any and all copyright interest in the | |
# software to the public domain. We make this dedication for the benefit | |
# of the public at large and to the detriment of our heirs and | |
# successors. We intend this dedication to be an overt act of | |
# relinquishment in perpetuity of all present and future rights to this | |
# software under copyright law. | |
# | |
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | |
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | |
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. | |
# IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR | |
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, | |
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | |
# OTHER DEALINGS IN THE SOFTWARE. | |
# | |
# For more information, please refer to <http://unlicense.org/> | |
######### | |
# Fix for https://github.com/GoogleCloudPlatform/gcloud-python/issues/1760 | |
# if this doesn't get me around the CLA, then it has at least taught me how to | |
# use sed. | |
# | |
# Usage: | |
# cp gcloud/streaming/transfer.py{,.bak} | |
# sed -f fix-1760.sed gcloud/streaming/transfer.py.bak \ | |
# > gcloud/streaming/transfer.py | |
# | |
# Add email_generator_class | |
/import acceptable_mime_type/a\ | |
\ | |
if six.PY3:\ | |
email_generator_class = email_generator.BytesGenerator\ | |
else:\ | |
email_generator_class = email_generator.Generator | |
/^class _Transfer/Mi\ | |
def ensure_bytes(str_or_bytes):\ | |
if six.PY3:\ | |
if isinstance(str_or_bytes, str):\ | |
return str_or_bytes.encode('utf-8')\ | |
elif isinstance(str_or_bytes, bytes):\ | |
return str_or_bytes\ | |
else:\ | |
if isinstance(str_or_bytes, str):\ | |
return str_or_bytes\ | |
\ | |
raise TypeError('Could not be coerced into bytes:', type(str_or_bytes))\ | |
\ | |
# In: _configure_multipart_request: | |
/^ def _configure_multipart_request/,/^ def/{ | |
# - Use email_generator_class | |
s/\(generator = email_generator\).Generator/\1_class/ | |
# - Use six.BytesIO | |
s/\(stream = \)six.StringIO/\1six.BytesIO/ | |
# - Add binary version of multipart_boundary | |
/multipart_boundary = /{ | |
h | |
s/^\(\s*\).*/\1/ | |
H | |
g | |
s/$/multipart_boundary_bytes = ensure_bytes(multipart_boundary)/ | |
} | |
# - Replace all following multipart_boundary{,_bytes} | |
/body_components = /,/\n\s*def /{ | |
/multipart_boundary_/!s/multipart_boundary/\0_bytes/g | |
s/\('[^.]*\?\)'/b\0/g | |
} | |
} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment