Morph MORPH
SIGN IN SIGN UP
sqlmapproject / sqlmap UNCLAIMED

Automatic SQL injection and database takeover tool

0 0 0 Python
Normal View History Raw
Last preparations for DREI
2019-05-08 12:47:52 +02:00
#!/usr/bin/env python
After the storm, a restore..
2008-10-15 15:38:22 +00:00
"""
Year bump
2026-01-01 19:12:07 +01:00
Copyright (c) 2006-2026 sqlmap developers (https://sqlmap.org)
Replacing doc/COPYING to LICENSE
2017-10-11 14:50:46 +02:00
See the file 'LICENSE' for copying permission
After the storm, a restore..
2008-10-15 15:38:22 +00:00
"""
Minor speed up
2016-10-26 22:33:04 +02:00
try:
Fixes #2253
2016-10-29 00:13:04 +02:00
import cPickle as pickle
Minor speed up
2016-10-26 22:33:04 +02:00
except:
Fixes #2253
2016-10-29 00:13:04 +02:00
import pickle
Minor speed up
2016-10-26 22:33:04 +02:00
Patch for an Issue #1117
2015-01-15 17:32:07 +01:00
import base64
More DREI updates
2019-05-08 12:28:50 +02:00
import binascii
Stabilizing DREI
2019-05-03 13:20:15 +02:00
import codecs
preparing to handle logging calls by a separate file descriptor when sqlmap is executed by the REST API - issue #297
2013-01-09 22:08:50 +00:00
import json
Fixes #1639
2016-01-08 11:47:12 +01:00
import re
Avoiding md5/sha1 deprecated warning in Python >=2.6
2010-02-23 08:54:33 +00:00
import sys
Implements option --time-limit (#5502)
2023-09-28 20:34:52 +02:00
import time
After the storm, a restore..
2008-10-15 15:38:22 +00:00
Patches #3773
2019-06-26 11:02:43 +02:00
from lib.core.bigarray import BigArray
Minor update
2019-12-09 11:35:22 +01:00
from lib.core.compat import xrange
Fixes #3622
2019-05-06 00:54:21 +02:00
from lib.core.data import conf
from lib.core.data import kb
Stabilizing DREI
2019-05-03 13:20:15 +02:00
from lib.core.settings import INVALID_UNICODE_PRIVATE_AREA
Minor update
2019-05-21 14:37:55 +02:00
from lib.core.settings import IS_TTY
Fix for an Issue #129
2012-07-31 11:03:44 +02:00
from lib.core.settings import IS_WIN
Fixes #3622
2019-05-06 00:54:21 +02:00
from lib.core.settings import NULL
Stabilizing first drei compatible prototype
2019-05-02 11:26:31 +02:00
from lib.core.settings import PICKLE_PROTOCOL
Stabilizing DREI
2019-05-03 13:20:15 +02:00
from lib.core.settings import SAFE_HEX_MARKER
further update regarding last commit
2011-03-03 10:39:04 +00:00
from lib.core.settings import UNICODE_ENCODING
Dealing with basesting (one baby step closer to Py3 salvation)
2019-03-28 13:53:54 +01:00
from thirdparty import six
Some more drei updates
2019-05-15 10:57:22 +02:00
from thirdparty.six import unichr as _unichr
Minor Python2 bug fix
2025-12-28 11:26:17 +01:00
from thirdparty.six.moves import html_parser
Brrrrr incompatibilities with every new Python minor revision
2021-01-15 09:31:57 +01:00
from thirdparty.six.moves import collections_abc as _collections
Major enhancement to directly connect to the dbms without passing via a sql injection: adapted code accordingly - see #158. This feature relies on python third-party libraries to be able to connect to the database. For the moment it has been implemented for MySQL (with python-mysqldb module) and PostgreSQL (with python-psycopg2 module). Minor layout adjustments.
2010-03-26 23:23:25 +00:00
Fixes #4024
2019-12-02 10:10:58 +01:00
try:
from html import escape as htmlEscape
except ImportError:
from cgi import escape as htmlEscape
code review of modules in lib/core directory
2011-01-15 12:13:45 +00:00
def base64pickle(value):
Update for an Issue #352
2013-03-11 14:58:05 +01:00
"""
Serializes (with pickle) and encodes to Base64 format supplied (binary) value
More drei stuff
2019-05-02 16:54:54 +02:00
>>> base64unpickle(base64pickle([1, 2, 3])) == [1, 2, 3]
True
Update for an Issue #352
2013-03-11 14:58:05 +01:00
"""
Patch for an Issue #260
2012-11-26 11:16:59 +01:00
retVal = None
Patch for an Issue #929
2014-11-13 10:52:33 +01:00
Patch for an Issue #260
2012-11-26 11:16:59 +01:00
try:
Patching session PY2<->PY3 incompatibility issue
2020-09-09 16:15:23 +02:00
retVal = encodeBase64(pickle.dumps(value, PICKLE_PROTOCOL), binary=False)
Patch for an Issue #260
2012-11-26 11:16:59 +01:00
except:
warnMsg = "problem occurred while serializing "
warnMsg += "instance of a type '%s'" % type(value)
singleTimeWarnMessage(warnMsg)
Minor fix (user reported problem via email)
2014-05-29 09:33:14 +02:00
try:
Patching session PY2<->PY3 incompatibility issue
2020-09-09 16:15:23 +02:00
retVal = encodeBase64(pickle.dumps(value), binary=False)
Minor fix (user reported problem via email)
2014-05-29 09:33:14 +02:00
except:
Minor patches
2025-12-28 01:17:19 +01:00
raise
Minor fix (user reported problem via email)
2014-05-29 09:33:14 +02:00
Patch for an Issue #260
2012-11-26 11:16:59 +01:00
return retVal
Added resume functionality to -d and fixed logging with -d
2010-04-12 09:35:20 +00:00
Minor refactoring
2019-03-27 01:28:34 +01:00
def base64unpickle(value):
Update for an Issue #352
2013-03-11 14:58:05 +01:00
"""
Minor language fix
2013-03-26 14:11:17 +01:00
Decodes value from Base64 to plain format and deserializes (with pickle) its content
Update for an Issue #352
2013-03-11 14:58:05 +01:00
More drei stuff
2019-05-02 16:54:54 +02:00
>>> type(base64unpickle('gAJjX19idWlsdGluX18Kb2JqZWN0CnEBKYFxAi4=')) == object
True
Update for an Issue #352
2013-03-11 14:58:05 +01:00
"""
Patch for an Issue #929
2014-11-13 10:52:33 +01:00
retVal = None
try:
Stabilizing DREI
2019-05-03 13:20:15 +02:00
retVal = pickle.loads(decodeBase64(value))
Some more PEPing (I hope that I haven't broke anything)
2018-03-13 13:45:42 +01:00
except TypeError:
Stabilizing DREI
2019-05-03 13:20:15 +02:00
retVal = pickle.loads(decodeBase64(bytes(value)))
More drei stuff
2019-05-02 16:54:54 +02:00
return retVal
fix for a google bug reported by Brandon E.
2010-10-01 08:03:39 +00:00
Trivial case update
2019-05-20 11:24:43 +02:00
def htmlUnescape(value):
Update for an Issue #352
2013-03-11 14:58:05 +01:00
"""
Minor improvement
2025-12-28 00:55:09 +01:00
Returns HTML unescaped value
Update for an Issue #352
2013-03-11 14:58:05 +01:00
Couple of patches (related to previous commit)
2019-05-31 23:32:28 +02:00
>>> htmlUnescape('a&lt;b') == 'a<b'
True
Minor patch
2025-12-28 00:45:12 +01:00
>>> htmlUnescape('a&lt;b') == 'a<b'
True
>>> htmlUnescape('&#x66;&#x6f;&#x6f;&#x62;&#x61;&#x72;') == 'foobar'
True
Minor improvement
2025-12-28 00:55:09 +01:00
>>> htmlUnescape('&#102;&#111;&#111;&#98;&#97;&#114;') == 'foobar'
True
>>> htmlUnescape('&copy;&euro;') == htmlUnescape('&#xA9;&#x20AC;')
True
Update for an Issue #352
2013-03-11 14:58:05 +01:00
"""
Dealing with basesting (one baby step closer to Py3 salvation)
2019-03-28 13:53:54 +01:00
if value and isinstance(value, six.string_types):
Minor improvement
2025-12-28 00:55:09 +01:00
if six.PY3:
import html
return html.unescape(value)
else:
return html_parser.HTMLParser().unescape(value)
return value
Fix for an Issue #129
2012-07-31 11:03:44 +02:00
Trivial comment update
2018-03-21 14:29:54 +01:00
def singleTimeWarnMessage(message): # Cross-referenced function
Patch for an Issue #978
2014-11-29 23:33:24 +01:00
sys.stdout.write(message)
sys.stdout.write("\n")
sys.stdout.flush()
Fix for an Issue #129
2012-07-31 11:03:44 +02:00
Fixes #3622
2019-05-06 00:54:21 +02:00
def filterNone(values): # Cross-referenced function
Brrrrr incompatibilities with every new Python minor revision
2021-01-15 09:31:57 +01:00
return [_ for _ in values if _] if isinstance(values, _collections.Iterable) else values
Fixes #3622
2019-05-06 00:54:21 +02:00
def isListLike(value): # Cross-referenced function
Patches #3773
2019-06-26 11:02:43 +02:00
return isinstance(value, (list, tuple, set, BigArray))
Fixes #3622
2019-05-06 00:54:21 +02:00
Patch related to the #3453
2019-05-21 14:18:14 +02:00
def shellExec(cmd): # Cross-referenced function
raise NotImplementedError
preparing to handle logging calls by a separate file descriptor when sqlmap is executed by the REST API - issue #297
2013-01-09 22:08:50 +00:00
def jsonize(data):
Update for an Issue #352
2013-03-11 14:58:05 +01:00
"""
Returns JSON serialized data
>>> jsonize({'foo':'bar'})
'{\\n "foo": "bar"\\n}'
"""
preparing to handle logging calls by a separate file descriptor when sqlmap is executed by the REST API - issue #297
2013-01-09 22:08:50 +00:00
return json.dumps(data, sort_keys=False, indent=4)
major enhancement, code refactoring for issue #297
2013-01-29 01:39:27 +00:00
def dejsonize(data):
Update for an Issue #352
2013-03-11 14:58:05 +01:00
"""
Returns JSON deserialized data
More drei stuff
2019-05-02 16:54:54 +02:00
>>> dejsonize('{\\n "foo": "bar"\\n}') == {u'foo': u'bar'}
True
Update for an Issue #352
2013-03-11 14:58:05 +01:00
"""
major enhancement, code refactoring for issue #297
2013-01-29 01:39:27 +00:00
return json.loads(data)
Stabilizing DREI
2019-05-03 13:20:15 +02:00
def decodeHex(value, binary=True):
"""
Minor patches
2025-11-06 11:41:35 +01:00
Returns a decoded representation of the provided hexadecimal value
Stabilizing DREI
2019-05-03 13:20:15 +02:00
>>> decodeHex("313233") == b"123"
True
>>> decodeHex("313233", binary=False) == u"123"
True
"""
retVal = value
if isinstance(value, six.binary_type):
Fixes #3622
2019-05-06 00:54:21 +02:00
value = getText(value)
Stabilizing DREI
2019-05-03 13:20:15 +02:00
if value.lower().startswith("0x"):
value = value[2:]
More DREI updates
2019-05-08 12:28:50 +02:00
try:
retVal = codecs.decode(value, "hex")
except LookupError:
retVal = binascii.unhexlify(value)
Stabilizing DREI
2019-05-03 13:20:15 +02:00
if not binary:
retVal = getText(retVal)
return retVal
def encodeHex(value, binary=True):
"""
Minor patches
2025-11-06 11:41:35 +01:00
Returns an encoded representation of the provided value
Stabilizing DREI
2019-05-03 13:20:15 +02:00
>>> encodeHex(b"123") == b"313233"
True
>>> encodeHex("123", binary=False)
'313233'
Fixes #3796
2019-07-04 11:18:55 +02:00
>>> encodeHex(b"123"[0]) == b"31"
True
Minor patch
2025-12-28 00:58:30 +01:00
>>> encodeHex(123, binary=False)
'7b'
Stabilizing DREI
2019-05-03 13:20:15 +02:00
"""
Fixes #3796
2019-07-04 11:18:55 +02:00
if isinstance(value, int):
Minor patch
2025-12-28 00:58:30 +01:00
value = six.int2byte(value)
Fixes #3796
2019-07-04 11:18:55 +02:00
Stabilizing DREI
2019-05-03 13:20:15 +02:00
if isinstance(value, six.text_type):
value = value.encode(UNICODE_ENCODING)
More DREI updates
2019-05-08 12:28:50 +02:00
try:
retVal = codecs.encode(value, "hex")
except LookupError:
retVal = binascii.hexlify(value)
Stabilizing DREI
2019-05-03 13:20:15 +02:00
if not binary:
retVal = getText(retVal)
return retVal
Patch related to the #3927
2019-09-16 19:29:38 +02:00
def decodeBase64(value, binary=True, encoding=None):
Stabilizing DREI
2019-05-03 13:20:15 +02:00
"""
Returns a decoded representation of provided Base64 value
>>> decodeBase64("MTIz") == b"123"
True
>>> decodeBase64("MTIz", binary=False)
'123'
Introduction of --base64-safe
2020-08-10 22:26:03 +02:00
>>> decodeBase64("A-B_CDE") == decodeBase64("A+B/CDE")
Minor improvement
2020-08-10 21:54:58 +02:00
True
Minor patch
2020-07-01 11:56:24 +02:00
>>> decodeBase64(b"MTIzNA") == b"1234"
True
>>> decodeBase64("MTIzNA") == b"1234"
True
>>> decodeBase64("MTIzNA==") == b"1234"
True
Stabilizing DREI
2019-05-03 13:20:15 +02:00
"""
Minor improvement
2020-08-10 21:54:58 +02:00
if value is None:
return None
Minor patch
2020-07-01 11:56:24 +02:00
padding = b'=' if isinstance(value, bytes) else '='
# Reference: https://stackoverflow.com/a/49459036
if not value.endswith(padding):
value += 3 * padding
Minor improvement
2020-08-10 21:54:58 +02:00
# Reference: https://en.wikipedia.org/wiki/Base64#URL_applications
# Reference: https://perldoc.perl.org/MIME/Base64.html
if isinstance(value, bytes):
value = value.replace(b'-', b'+').replace(b'_', b'/')
else:
value = value.replace('-', '+').replace('_', '/')
Stabilizing DREI
2019-05-03 13:20:15 +02:00
retVal = base64.b64decode(value)
if not binary:
Patch related to the #3927
2019-09-16 19:29:38 +02:00
retVal = getText(retVal, encoding)
Stabilizing DREI
2019-05-03 13:20:15 +02:00
return retVal
Introduction of --base64-safe
2020-08-10 22:26:03 +02:00
def encodeBase64(value, binary=True, encoding=None, padding=True, safe=False):
Stabilizing DREI
2019-05-03 13:20:15 +02:00
"""
Minor patches
2025-11-06 11:41:35 +01:00
Returns a Base64 encoded representation of the provided value
Stabilizing DREI
2019-05-03 13:20:15 +02:00
>>> encodeBase64(b"123") == b"MTIz"
True
Minor improvement
2020-08-10 21:54:58 +02:00
>>> encodeBase64(u"1234", binary=False)
'MTIzNA=='
>>> encodeBase64(u"1234", binary=False, padding=False)
'MTIzNA'
Introduction of --base64-safe
2020-08-10 22:26:03 +02:00
>>> encodeBase64(decodeBase64("A-B_CDE"), binary=False, safe=True)
'A-B_CDE'
Stabilizing DREI
2019-05-03 13:20:15 +02:00
"""
Minor improvement
2020-08-10 21:54:58 +02:00
if value is None:
return None
Stabilizing DREI
2019-05-03 13:20:15 +02:00
if isinstance(value, six.text_type):
Patch related to the #3927
2019-09-16 19:29:38 +02:00
value = value.encode(encoding or UNICODE_ENCODING)
Stabilizing DREI
2019-05-03 13:20:15 +02:00
retVal = base64.b64encode(value)
if not binary:
Patch related to the #3927
2019-09-16 19:29:38 +02:00
retVal = getText(retVal, encoding)
Stabilizing DREI
2019-05-03 13:20:15 +02:00
Introduction of --base64-safe
2020-08-10 22:26:03 +02:00
if safe:
padding = False
# Reference: https://en.wikipedia.org/wiki/Base64#URL_applications
# Reference: https://perldoc.perl.org/MIME/Base64.html
if isinstance(retVal, bytes):
retVal = retVal.replace(b'+', b'-').replace(b'/', b'_')
else:
retVal = retVal.replace('+', '-').replace('/', '_')
Minor improvement
2020-08-10 21:54:58 +02:00
if not padding:
retVal = retVal.rstrip(b'=' if isinstance(retVal, bytes) else '=')
Stabilizing DREI
2019-05-03 13:20:15 +02:00
return retVal
Patch regarding #4066
2020-01-09 11:59:50 +01:00
def getBytes(value, encoding=None, errors="strict", unsafe=True):
Stabilizing DREI
2019-05-03 13:20:15 +02:00
"""
Returns byte representation of provided Unicode value
>>> getBytes(u"foo\\\\x01\\\\x83\\\\xffbar") == b"foo\\x01\\x83\\xffbar"
True
"""
retVal = value
Patch regarding #4066
2020-01-09 11:59:50 +01:00
if encoding is None:
More refactoring for #4077
2020-01-15 22:47:06 +01:00
encoding = conf.get("encoding") or UNICODE_ENCODING
Patch regarding #4066
2020-01-09 11:59:50 +01:00
Fixes #4020
2019-11-30 23:10:20 +01:00
try:
codecs.lookup(encoding)
Patch regarding #4066
2020-01-09 11:59:50 +01:00
except (LookupError, TypeError):
Fixes #4020
2019-11-30 23:10:20 +01:00
encoding = UNICODE_ENCODING
Minor patches
2026-01-04 23:39:28 +01:00
if isinstance(value, bytearray):
return bytes(value)
elif isinstance(value, memoryview):
return value.tobytes()
elif isinstance(value, six.text_type):
Stabilizing DREI
2019-05-03 13:20:15 +02:00
if INVALID_UNICODE_PRIVATE_AREA:
Proper (safe) showing of safe encoded data
2019-05-07 16:43:01 +02:00
if unsafe:
for char in xrange(0xF0000, 0xF00FF + 1):
Some more drei updates
2019-05-15 10:57:22 +02:00
value = value.replace(_unichr(char), "%s%02x" % (SAFE_HEX_MARKER, char - 0xF0000))
Stabilizing DREI
2019-05-03 13:20:15 +02:00
retVal = value.encode(encoding, errors)
Proper (safe) showing of safe encoded data
2019-05-07 16:43:01 +02:00
if unsafe:
Minor bug fix
2025-11-06 11:14:13 +01:00
retVal = re.sub((r"%s([0-9a-f]{2})" % SAFE_HEX_MARKER).encode(), lambda _: decodeHex(_.group(1)), retVal)
Stabilizing DREI
2019-05-03 13:20:15 +02:00
else:
Fixes #4214
2020-05-27 15:39:03 +02:00
try:
retVal = value.encode(encoding, errors)
except UnicodeError:
retVal = value.encode(UNICODE_ENCODING, errors="replace")
Proper (safe) showing of safe encoded data
2019-05-07 16:43:01 +02:00
if unsafe:
retVal = re.sub(b"\\\\x([0-9a-f]{2})", lambda _: decodeHex(_.group(1)), retVal)
Stabilizing DREI
2019-05-03 13:20:15 +02:00
return retVal
def getOrds(value):
"""
Returns ORD(...) representation of provided string value
>>> getOrds(u'fo\\xf6bar')
[102, 111, 246, 98, 97, 114]
>>> getOrds(b"fo\\xc3\\xb6bar")
[102, 111, 195, 182, 98, 97, 114]
"""
return [_ if isinstance(_, int) else ord(_) for _ in value]
Fixes #3622
2019-05-06 00:54:21 +02:00
def getUnicode(value, encoding=None, noneToNull=False):
"""
Minor improvement of table dump formatting
2019-10-29 15:00:53 +01:00
Returns the unicode representation of the supplied value
Fixes #3622
2019-05-06 00:54:21 +02:00
>>> getUnicode('test') == u'test'
True
>>> getUnicode(1) == u'1'
True
Fixes #4513
2021-01-05 14:50:54 +01:00
>>> getUnicode(None) == 'None'
True
Minor refactoring
2025-12-31 10:35:40 +01:00
>>> getUnicode(b'/etc/passwd') == '/etc/passwd'
True
Fixes #3622
2019-05-06 00:54:21 +02:00
"""
Implements option --time-limit (#5502)
2023-09-28 20:34:52 +02:00
# Best position for --time-limit mechanism
if conf.get("timeLimit") and kb.get("startTime") and (time.time() - kb.startTime > conf.timeLimit):
raise SystemExit
Fixes #3622
2019-05-06 00:54:21 +02:00
if noneToNull and value is None:
return NULL
if isinstance(value, six.text_type):
return value
elif isinstance(value, six.binary_type):
# Heuristics (if encoding not explicitly specified)
candidates = filterNone((encoding, kb.get("pageEncoding") if kb.get("originalPage") else None, conf.get("encoding"), UNICODE_ENCODING, sys.getfilesystemencoding()))
if all(_ in value for _ in (b'<', b'>')):
pass
Minor refactoring
2025-12-31 10:35:40 +01:00
elif b'\n' not in value and re.search(r"(?i)\w+\.\w{2,3}\Z|\A(\w:\\|/\w+)", six.text_type(value, UNICODE_ENCODING, errors="ignore")):
Fixes #3622
2019-05-06 00:54:21 +02:00
candidates = filterNone((encoding, sys.getfilesystemencoding(), kb.get("pageEncoding") if kb.get("originalPage") else None, UNICODE_ENCODING, conf.get("encoding")))
elif conf.get("encoding") and b'\n' not in value:
candidates = filterNone((encoding, conf.get("encoding"), kb.get("pageEncoding") if kb.get("originalPage") else None, sys.getfilesystemencoding(), UNICODE_ENCODING))
for candidate in candidates:
try:
return six.text_type(value, candidate)
Minor patch
2020-01-08 00:11:13 +01:00
except (UnicodeDecodeError, LookupError):
Fixes #3622
2019-05-06 00:54:21 +02:00
pass
try:
return six.text_type(value, encoding or (kb.get("pageEncoding") if kb.get("originalPage") else None) or UNICODE_ENCODING)
except UnicodeDecodeError:
return six.text_type(value, UNICODE_ENCODING, errors="reversible")
elif isListLike(value):
value = list(getUnicode(_, encoding, noneToNull) for _ in value)
return value
else:
try:
return six.text_type(value)
except UnicodeDecodeError:
return six.text_type(str(value), errors="ignore") # encoding ignored for non-basestring instances
Patch related to the #3927
2019-09-16 19:29:38 +02:00
def getText(value, encoding=None):
Stabilizing DREI
2019-05-03 13:20:15 +02:00
"""
Returns textual value of a given value (Note: not necessary Unicode on Python2)
>>> getText(b"foobar")
'foobar'
>>> isinstance(getText(u"fo\\u2299bar"), six.text_type)
True
"""
retVal = value
if isinstance(value, six.binary_type):
Patch related to the #3927
2019-09-16 19:29:38 +02:00
retVal = getUnicode(value, encoding)
Stabilizing DREI
2019-05-03 13:20:15 +02:00
if six.PY2:
try:
retVal = str(retVal)
except:
pass
return retVal
Improvement for #3453
2019-05-25 00:22:27 +02:00
def stdoutEncode(value):
"""
Minor improvement of stdoutEncode
2025-12-31 11:04:12 +01:00
Returns textual representation of a given value safe for writing to stdout
>>> stdoutEncode(b"foobar")
'foobar'
Improvement for #3453
2019-05-25 00:22:27 +02:00
"""
Minor improvement of stdoutEncode
2025-12-31 11:04:12 +01:00
if value is None:
value = ""
Improvement for #3453
2019-05-25 00:22:27 +02:00
if IS_WIN and IS_TTY and kb.get("codePage", -1) is None:
output = shellExec("chcp")
match = re.search(r": (\d{3,})", output or "")
if match:
try:
candidate = "cp%s" % match.group(1)
codecs.lookup(candidate)
kb.codePage = candidate
Minor improvement of stdoutEncode
2025-12-31 11:04:12 +01:00
except (LookupError, TypeError):
pass
Improvement for #3453
2019-05-25 00:22:27 +02:00
kb.codePage = kb.codePage or ""
Minor improvement of stdoutEncode
2025-12-31 11:04:12 +01:00
encoding = kb.get("codePage") or getattr(sys.stdout, "encoding", None) or UNICODE_ENCODING
Improvement for #3453
2019-05-25 00:22:27 +02:00
Minor improvement of stdoutEncode
2025-12-31 11:04:12 +01:00
if six.PY3:
if isinstance(value, (bytes, bytearray)):
value = getUnicode(value, encoding)
elif not isinstance(value, str):
value = str(value)
Improvement for #3453
2019-05-25 00:22:27 +02:00
Minor improvement of stdoutEncode
2025-12-31 11:04:12 +01:00
try:
retVal = value.encode(encoding, errors="replace").decode(encoding, errors="replace")
except (LookupError, TypeError):
retVal = value.encode("ascii", errors="replace").decode("ascii", errors="replace")
Improvement for #3453
2019-05-25 00:22:27 +02:00
else:
Minor improvement of stdoutEncode
2025-12-31 11:04:12 +01:00
if isinstance(value, six.text_type):
try:
retVal = value.encode(encoding, errors="replace")
except (LookupError, TypeError):
retVal = value.encode("ascii", errors="replace")
else:
retVal = value
Improvement for #3453
2019-05-25 00:22:27 +02:00
return retVal
Minor improvement of table dump formatting
2019-10-29 15:00:53 +01:00
def getConsoleLength(value):
"""
Returns console width of unicode values
>>> getConsoleLength("abc")
3
>>> getConsoleLength(u"\\u957f\\u6c5f")
4
"""
if isinstance(value, six.text_type):
Minor optimizations
2025-12-25 22:15:06 +01:00
retVal = len(value) + sum(ord(_) >= 0x3000 for _ in value)
Minor improvement of table dump formatting
2019-10-29 15:00:53 +01:00
else:
retVal = len(value)
Fixes #4020
2019-11-30 23:10:20 +01:00
return retVal
Reference in New Issue Copy Permalink