Skip to content

Commit 6535036

Browse files
committed
Add check for naming conventions
1 parent 5103b32 commit 6535036

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ flake8-docstrings
44
invoke
55
isort
66
mypy
7+
pep8-naming
78
pytest

src/google_voice_history.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from contextlib import contextmanager
2828
from datetime import datetime
2929
from typing import IO, Any, Dict, Iterable, Iterator, List, Optional
30-
from xml.etree import ElementTree as ET
30+
from xml.etree import ElementTree
3131

3232
CALL_PATTERN = (
3333
r"Takeout/Voice/(?P<directory>Calls|Spam)/"
@@ -194,13 +194,13 @@ def parse_file(filename: str, takeout: zipfile.ZipFile) -> CallDict:
194194
content = takeout.read(filename).decode("utf-8")
195195

196196
try:
197-
xml = ET.fromstring(
197+
xml = ElementTree.fromstring(
198198
# HACK: Remove HTML tags and entities that cause XML parse errors
199199
# This is fine because we don't care about the content
200200
# Alternatively, use a proper HTML parser like lxml.html or pyquery
201201
content.replace("<br>", "").replace("&", ""),
202202
)
203-
except ET.ParseError as exc:
203+
except ElementTree.ParseError as exc:
204204
raise ValueError(f"Error parsing {filename}") from exc
205205

206206
return {
@@ -210,7 +210,7 @@ def parse_file(filename: str, takeout: zipfile.ZipFile) -> CallDict:
210210
}
211211

212212

213-
def parse_call_duration(xml: ET.Element) -> Optional[str]:
213+
def parse_call_duration(xml: ElementTree.Element) -> Optional[str]:
214214
"""
215215
Parse a call's duration from HTML.
216216
@@ -223,7 +223,7 @@ def parse_call_duration(xml: ET.Element) -> Optional[str]:
223223
return element.text.strip("()")
224224

225225

226-
def parse_call_datetime(xml: ET.Element) -> Optional[datetime]:
226+
def parse_call_datetime(xml: ElementTree.Element) -> Optional[datetime]:
227227
"""
228228
Parse a call's timestamp from HTML.
229229
@@ -249,7 +249,7 @@ def format_datetime(dt: Optional[datetime]) -> CallDict:
249249
}
250250

251251

252-
def parse_messages(xml: ET.Element) -> CallDict:
252+
def parse_messages(xml: ElementTree.Element) -> CallDict:
253253
"""
254254
Parse message metadata from HTML.
255255
@@ -280,7 +280,7 @@ def parse_messages(xml: ET.Element) -> CallDict:
280280
}
281281

282282

283-
def parse_message_datetime(xml: ET.Element) -> Optional[datetime]:
283+
def parse_message_datetime(xml: ElementTree.Element) -> Optional[datetime]:
284284
"""
285285
Parse a message's timestamp from HTML.
286286

0 commit comments

Comments
 (0)