Skip to content

Changed dotnet Encoding to System Locale Dependent #186

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

Merged
sriram-mv merged 6 commits into from
Aug 6, 2020
Merged

Changed dotnet Encoding to System Locale Dependent #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fdf27ec
Added Dynamic Encoding Selection Based on Windows System Default
CoshUS Jul 23, 2020
bf0cb25
Fixed dotnet output system dependent encoding
CoshUS Jul 24, 2020
04b91a8
Updated test_custom_make urllib3 Version
CoshUS Jul 24, 2020
991c4b8
Reformatted with black
CoshUS Jul 24, 2020
a11a6ea
Rollback Changes to popen for Python 2 Support
CoshUS Jul 27, 2020
29dbbfd
Added Doc Page for DotNet Output Encoding
CoshUS Aug 4, 2020
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ typings/
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff:
.vscode

# Sensitive or high-churn files:

Expand Down
9 changes: 7 additions & 2 deletions aws_lambda_builders/workflows/dotnet_clipackage/dotnetcli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import sys
import logging
import locale

from .utils import OSUtils

Expand Down Expand Up @@ -49,14 +50,18 @@ def run(self, args, cwd=None):

LOG.debug("executing dotnet: %s", invoke_dotnet)

# DotNet output is in system locale dependent encoding
# https://docs.microsoft.com/en-us/dotnet/api/system.console.outputencoding?view=netcore-3.1#remarks
# "The default code page that the console uses is determined by the system locale."
encoding = locale.getpreferredencoding()
p = self.os_utils.popen(invoke_dotnet, stdout=self.os_utils.pipe, stderr=self.os_utils.pipe, cwd=cwd)

out, err = p.communicate()

# The package command contains lots of useful information on how the package was created and
# information when the package command was not successful. For that reason the output is
# always written to the output to help developers diagnose issues.
LOG.info(out.decode("utf8").strip())
LOG.info(out.decode(encoding).strip())

if p.returncode != 0:
raise DotnetCLIExecutionError(message=err.decode("utf8").strip())
raise DotnetCLIExecutionError(message=err.decode(encoding).strip())
2 changes: 1 addition & 1 deletion tests/integration/workflows/custom_make/test_custom_make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def test_must_build_python_project_through_makefile(self):
"chardet",
"urllib3",
"idna",
"urllib3-1.25.9.dist-info",
"urllib3-1.25.10.dist-info",
"chardet-3.0.4.dist-info",
"certifi-2020.4.5.2.dist-info",
"certifi",
Expand Down