Merge pull request #182 from cleder/typing

Typing

.pre-commit-config.yaml

@@ -20,6 +20,19 @@ repos:
       - id: pretty-format-json
       - id: requirements-txt-fixer
       - id: trailing-whitespace
+  - repo: https://github.com/ikamensh/flynt/
+    rev: "0.76"
+    hooks:
+      - id: flynt
+  - repo: https://github.com/MarcoGorelli/absolufy-imports
+    rev: v0.3.1
+    hooks:
+      - id: absolufy-imports
+  - repo: https://github.com/hakancelikdev/unimport
+    rev: 0.12.1
+    hooks:
+      - id: unimport
+        args: [--remove, --include-star-import, --ignore-init, --gitignore]
   - repo: https://github.com/psf/black
     rev: 22.10.0
     hooks:

fastkml/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2012  Christian Ledermann
+# Copyright (C) 2012 -2022 Christian Ledermann
 #
 # This library is free software; you can redistribute it and/or modify it under
 # the terms of the GNU Lesser General Public License as published by the Free
@@ -27,27 +27,28 @@
 from pkg_resources import DistributionNotFound
 from pkg_resources import get_distribution
 
-from .atom import Author
-from .atom import Contributor
-from .atom import Link
-from .kml import KML
-from .kml import Data
-from .kml import Document
-from .kml import ExtendedData
-from .kml import Folder
-from .kml import Placemark
-from .kml import Schema
-from .kml import SchemaData
-from .kml import TimeSpan
-from .kml import TimeStamp
-from .styles import BalloonStyle
-from .styles import IconStyle
-from .styles import LabelStyle
-from .styles import LineStyle
-from .styles import PolyStyle
-from .styles import Style
-from .styles import StyleMap
-from .styles import StyleUrl
+from fastkml.atom import Author
+from fastkml.atom import Contributor
+from fastkml.atom import Link
+from fastkml.data import Data
+from fastkml.data import ExtendedData
+from fastkml.data import Schema
+from fastkml.data import SchemaData
+from fastkml.gx import GxGeometry
+from fastkml.kml import KML
+from fastkml.kml import Document
+from fastkml.kml import Folder
+from fastkml.kml import Placemark
+from fastkml.styles import BalloonStyle
+from fastkml.styles import IconStyle
+from fastkml.styles import LabelStyle
+from fastkml.styles import LineStyle
+from fastkml.styles import PolyStyle
+from fastkml.styles import Style
+from fastkml.styles import StyleMap
+from fastkml.styles import StyleUrl
+from fastkml.times import TimeSpan
+from fastkml.times import TimeStamp
 
 try:
     __version__ = get_distribution("fastkml").version
@@ -63,6 +64,7 @@
     "TimeStamp",
     "ExtendedData",
     "Data",
+    "GxGeometry",
     "Schema",
     "SchemaData",
     "StyleUrl",

fastkml/atom.py

@@ -37,6 +37,7 @@
 from typing import Tuple
 
 from fastkml.base import _XMLObject
+from fastkml.config import ATOMNS as NS
 from fastkml.helpers import o_from_attr
 from fastkml.helpers import o_from_subelement_text
 from fastkml.helpers import o_int_from_attr
@@ -45,8 +46,6 @@
 from fastkml.types import Element
 from fastkml.types import KmlObjectMap
 
-from .config import ATOMNS as NS
-
 logger = logging.getLogger(__name__)
 regex = r"(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)"
 email_match = re.compile(regex).match

fastkml/base.py

@@ -21,12 +21,11 @@
 from typing import cast
 
 from fastkml import config
+from fastkml.helpers import o_from_attr
+from fastkml.helpers import o_to_attr
 from fastkml.types import Element
 from fastkml.types import KmlObjectMap
 
-from .helpers import o_from_attr
-from .helpers import o_to_attr
-
 logger = logging.getLogger(__name__)