projects
/
python_utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a doctest to type_utils.py.
[python_utils.git]
/
string_utils.py
diff --git
a/string_utils.py
b/string_utils.py
index 3ae9eeae96141fce9d4bb17516a5bace6ceb8b6f..3c97ff7991726012ff091dc7aa042abb88000bf6 100644
(file)
--- a/
string_utils.py
+++ b/
string_utils.py
@@
-142,16
+142,16
@@
MARGIN_RE = re.compile(r"^[^\S\r\n]+")
ESCAPE_SEQUENCE_RE = re.compile(r"
\e
\[[^A-Za-z]*[A-Za-z]")
NUM_SUFFIXES = {
ESCAPE_SEQUENCE_RE = re.compile(r"
\e
\[[^A-Za-z]*[A-Za-z]")
NUM_SUFFIXES = {
- "Pb": (1024
**
5),
- "P": (1024
**
5),
- "Tb": (1024
**
4),
- "T": (1024
**
4),
- "Gb": (1024
**
3),
- "G": (1024
**
3),
- "Mb": (1024
**
2),
- "M": (1024
**
2),
- "Kb": (1024
**
1),
- "K": (1024
**
1),
+ "Pb": (1024
**
5),
+ "P": (1024
**
5),
+ "Tb": (1024
**
4),
+ "T": (1024
**
4),
+ "Gb": (1024
**
3),
+ "G": (1024
**
3),
+ "Mb": (1024
**
2),
+ "M": (1024
**
2),
+ "Kb": (1024
**
1),
+ "K": (1024
**
1),
}
}
@@
-1075,13
+1075,13
@@
def to_date(in_str: str) -> Optional[datetime.date]:
"""
Parses a date string. See DateParser docs for details.
"""
"""
Parses a date string. See DateParser docs for details.
"""
- import dateparse.dateparse_utils as d
p # type: ignore
+ import dateparse.dateparse_utils as d
u
try:
try:
- d = d
p.DateParser()
+ d = d
u.DateParser() # type: ignore
d.parse(in_str)
return d.get_date()
d.parse(in_str)
return d.get_date()
- except d
p.ParseException:
+ except d
u.ParseException: # type: ignore
msg = f'Unable to parse date {in_str}.'
logger.warning(msg)
return None
msg = f'Unable to parse date {in_str}.'
logger.warning(msg)
return None
@@
-1091,13
+1091,14
@@
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:
- d = dp.DateParser()
+ d = dp.DateParser()
# type: ignore
_ = d.parse(in_str)
return True
_ = d.parse(in_str)
return True
- except dp.ParseException:
+ except dp.ParseException:
# type: ignore
msg = f'Unable to parse date {in_str}.'
logger.warning(msg)
return False
msg = f'Unable to parse date {in_str}.'
logger.warning(msg)
return False
@@
-1110,7
+1111,7
@@
def to_datetime(in_str: str) -> Optional[datetime.datetime]:
import dateparse.dateparse_utils as dp
try:
import dateparse.dateparse_utils as dp
try:
- d = dp.DateParser()
+ d = dp.DateParser()
# type: ignore
dt = d.parse(in_str)
if type(dt) == datetime.datetime:
return dt
dt = d.parse(in_str)
if type(dt) == datetime.datetime:
return dt