Skip to content

Commit e6e30ae

Browse files
committed
Fixed minor issues
1 parent 33bcf8e commit e6e30ae

3 files changed

Lines changed: 4 additions & 5 deletions

File tree

codext/__common__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,8 +340,7 @@ def _wrapper(param):
340340
if x not in tmp.keys():
341341
tmp[x] = k
342342
smapdict, cs = tmp, reduce(lambda acc, x: acc + x, tmp.keys())
343-
kwargs['strip_lines'] = "\n" not in set(cs)
344-
kwargs['strip_crlf'] = "\r" not in set(cs) and "\n" not in set(cs) and "\r\n" not in cs
343+
kwargs['strip_lines'], kwargs['strip_crlf'] = "\n" not in set(cs), "\r\n" not in cs
345344
# this allows to avoid an error with Python2 in the "for i, c in enumerate(parts)" loop
346345
if '' not in smapdict.keys():
347346
smapdict[''] = ""

codext/base/baseN.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
r'[-_]geohash': digits + "bcdefghjkmnpqrstuvwxyz",
4545
}
4646
base2n(B32, r"^base[-_]?32(|[-_]inv(?:erted)?|(?:[-_]ext(?:ended)?)?[-_]hex|[-_]geohash)$", padding_char="=",
47-
guess=["base32", "base32-inv", "base32-ext", "base32-geohash"])
47+
guess=["base32", "base32-inv", "base32-hex", "base32-geohash"])
4848
main32 = main(32, "RFC 4648")
49-
main32ext = main(32, "RFC 4648", "extended", False)
49+
main32hex = main(32, "RFC 4648", "hex", False)
5050
main32geo = main(32, "RFC 4648", "geohash", False)
5151

5252

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ console_scripts =
5050
base8 = codext.base.baseN:main8
5151
base16 = codext.base.baseN:main16
5252
base32 = codext.base.baseN:main32
53-
base32-extended = codext.base.baseN:main32ext
53+
base32-hex = codext.base.baseN:main32hex
5454
base32-geohash = codext.base.baseN:main32geo
5555
base32-z = codext.base.baseN:mainz32
5656
base36 = codext.base.baseN:main36

0 commit comments

Comments
 (0)