Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Proposal to fix #154 (v2)#161

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.

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

Already on GitHub?Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from1 commit
Commits
Show all changes
13 commits
Select commitHold shift + click to select a range
f9ddd04
Proposal to fix #154 (v2)
dmitry-lipetskDec 8, 2024
2bb38dc
[BUG FIX] PostgresNode::safe_psql did not respect "expect_error" para…
dmitry-lipetskDec 9, 2024
45b8dc0
[BUG FIX] A problem in psql/safe_psql and 'input' data was fixed [loc…
dmitry-lipetskDec 9, 2024
f848a63
PostgresNode::safe_psql raises InvalidOperationException
dmitry-lipetskDec 9, 2024
db0744e
A problem with InvalidOperationException and flake8 is fixed
dmitry-lipetskDec 9, 2024
5bb1510
A code style is fixed [flake8]
dmitry-lipetskDec 9, 2024
31c7bce
[BUG FIX] Wrappers for psql use subprocess.PIPE for stdout and stderr
dmitry-lipetskDec 9, 2024
b013801
[BUG FIX] TestgresTests::test_safe_psql__expect_error uses rm_carriag…
dmitry-lipetskDec 9, 2024
c49ee4c
node.py is updated [formatting]
dmitry-lipetskDec 10, 2024
6a0e714
Formatting
dmitry-lipetskDec 10, 2024
3cc19d2
raise_error.py is moved into testgres/operations from testgres/helpers
dmitry-lipetskDec 10, 2024
7b70e9e
Helpers.GetDefaultEncoding is added
dmitry-lipetskDec 10, 2024
cd0b5f8
Code normalization
dmitry-lipetskDec 10, 2024
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
PrevPrevious commit
NextNext commit
Helpers.GetDefaultEncoding is added
This function is equal to os_ops.get_default_encoding and is used in: - Helpers.PrepareProcessInput - RaiseError._TranslateDataIntoString__FromBinary
  • Loading branch information
@dmitry-lipetsk
dmitry-lipetsk committedDec 10, 2024
commit7b70e9e7a0b22fb999e308dab8bccc46e8e22a65
39 changes: 38 additions & 1 deletiontestgres/operations/helpers.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,48 @@
import locale


class Helpers:
def _make_get_default_encoding_func():
# locale.getencoding is added in Python 3.11
if hasattr(locale, 'getencoding'):
return locale.getencoding

# It must exist
return locale.getpreferredencoding

# Prepared pointer on function to get a name of system codepage
_get_default_encoding_func = _make_get_default_encoding_func()

def GetDefaultEncoding():
#
# Original idea/source was:
#
# def os_ops.get_default_encoding():
# if not hasattr(locale, 'getencoding'):
# locale.getencoding = locale.getpreferredencoding
# return locale.getencoding() or 'UTF-8'
#

assert __class__._get_default_encoding_func is not None

r = __class__._get_default_encoding_func()

if r:
assert r is not None
assert type(r) == str # noqa: E721
assert r != ""
return r

# Is it an unexpected situation?
return 'UTF-8'

def PrepareProcessInput(input, encoding):
if not input:
return None

if type(input) == str: # noqa: E721
if encoding is None:
return input.encode()
return input.encode(__class__.GetDefaultEncoding())

assert type(encoding) == str # noqa: E721
return input.encode(encoding)
Expand Down
3 changes: 2 additions & 1 deletiontestgres/operations/raise_error.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
from ..exceptions import ExecUtilException
from .helpers import Helpers


class RaiseError:
Expand DownExpand Up@@ -29,7 +30,7 @@ def _TranslateDataIntoString__FromBinary(data):
assert type(data) == bytes # noqa: E721

try:
return data.decode('utf-8')
return data.decode(Helpers.GetDefaultEncoding())
except UnicodeDecodeError:
pass

Expand Down

[8]ページ先頭

©2009-2025 Movatter.jp