projects
/
python_utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More cleanup, yey!
[python_utils.git]
/
string_utils.py
diff --git
a/string_utils.py
b/string_utils.py
index 3c97ff7991726012ff091dc7aa042abb88000bf6..d75c6ba1aca2c559ed4254d535747c54f4719bf5 100644
(file)
--- a/
string_utils.py
+++ b/
string_utils.py
@@
-1091,7
+1091,6
@@
def valid_date(in_str: str) -> bool:
"""
True if the string represents a valid date.
"""
"""
True if the string represents a valid date.
"""
- import dateparse
import dateparse.dateparse_utils as dp
try:
import dateparse.dateparse_utils as dp
try:
@@
-1113,7
+1112,7
@@
def to_datetime(in_str: str) -> Optional[datetime.datetime]:
try:
d = dp.DateParser() # type: ignore
dt = d.parse(in_str)
try:
d = dp.DateParser() # type: ignore
dt = d.parse(in_str)
- if
type(dt) == datetime.datetime
:
+ if
isinstance(dt, datetime.datetime)
:
return dt
except ValueError:
msg = f'Unable to parse datetime {in_str}.'
return dt
except ValueError:
msg = f'Unable to parse datetime {in_str}.'
@@
-1372,7
+1371,7
@@
def make_contractions(txt: str) -> str:
for second in second_list:
# Disallow there're/where're. They're valid English
# but sound weird.
for second in second_list:
# Disallow there're/where're. They're valid English
# but sound weird.
- if (first
== 'there' or first == 'where'
) and second == 'a(re)':
+ if (first
in ('there', 'where')
) and second == 'a(re)':
continue
pattern = fr'\b({first})\s+{second}\b'
continue
pattern = fr'\b({first})\s+{second}\b'
@@
-1458,11
+1457,11
@@
def shuffle_columns_into_list(
# Column specs map input lines' columns into outputs.
# [col1, col2...]
for spec in column_specs:
# Column specs map input lines' columns into outputs.
# [col1, col2...]
for spec in column_specs:
-
c
hunk = ''
+ hunk = ''
for n in spec:
for n in spec:
-
chunk = c
hunk + delim + input_lines[n]
-
chunk = c
hunk.strip(delim)
- out.append(
c
hunk)
+
hunk =
hunk + delim + input_lines[n]
+
hunk =
hunk.strip(delim)
+ out.append(hunk)
return out
return out
@@
-1488,11
+1487,11
@@
def shuffle_columns_into_dict(
# Column specs map input lines' columns into outputs.
# "key", [col1, col2...]
for spec in column_specs:
# Column specs map input lines' columns into outputs.
# "key", [col1, col2...]
for spec in column_specs:
-
c
hunk = ''
+ hunk = ''
for n in spec[1]:
for n in spec[1]:
-
chunk = c
hunk + delim + input_lines[n]
-
chunk = c
hunk.strip(delim)
- out[spec[0]] =
c
hunk
+
hunk =
hunk + delim + input_lines[n]
+
hunk =
hunk.strip(delim)
+ out[spec[0]] = hunk
return out
return out
@@
-1517,9
+1516,9
@@
def to_ascii(x: str):
b'1, 2, 3'
"""
b'1, 2, 3'
"""
- if
type(x) is str
:
+ if
isinstance(x, str)
:
return x.encode('ascii')
return x.encode('ascii')
- if
type(x) is bytes
:
+ if
isinstance(x, bytes)
:
return x
raise Exception('to_ascii works with strings and bytes')
return x
raise Exception('to_ascii works with strings and bytes')