Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent Paramiko size mismatch errors in utf-8 strings #997

Closed
wants to merge 3 commits into from
Closed

Prevent Paramiko size mismatch errors in utf-8 strings #997

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43e9a28
Use BytesIO instead of StringIO in files.template and files.put to pr…
sbj-ss Aug 8, 2023
9f474cd
Fixed samples
sbj-ss Aug 8, 2023
2095fb2
Merge branch '2.x' into 2.x
Fizzadar Nov 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions pyinfra/operations/files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import traceback
from datetime import timedelta
from fnmatch import fnmatch
from io import StringIO
from io import BytesIO

from jinja2 import TemplateRuntimeError, TemplateSyntaxError, UndefinedError

Expand Down Expand Up @@ -884,8 +884,8 @@ def put(
)

files.put(
name="Upload a StringIO object",
src=StringIO("file contents"),
name="Upload a BytesIO object",
src=BytesIO("file contents".encode("utf-8")),
dest="/etc/motd",
)
"""
Expand Down Expand Up @@ -1043,7 +1043,7 @@ def template(src, dest, user=None, group=None, mode=None, create_remote_dir=True
"entry 2"
]

template = StringIO("""
template = BytesIO("""
name: "{{ foo_variable }}"
dict_contents:
str1: "{{ foo_dict.str1 }}"
Expand All @@ -1052,7 +1052,7 @@ def template(src, dest, user=None, group=None, mode=None, create_remote_dir=True
{% for entry in foo_list %}
- "{{ entry }}"
{% endfor %}
""")
""".encode("utf-8"))

files.template(
name="Create a templated file",
Expand Down Expand Up @@ -1102,7 +1102,7 @@ def template(src, dest, user=None, group=None, mode=None, create_remote_dir=True
),
)

output_file = StringIO(output)
output_file = BytesIO(output.encode("utf-8"))
# Set the template attribute for nicer debugging
output_file.template = src

Expand Down
Loading