Use relative imports (#353)

* remove unused imports

* add kdf_uuids to parsing init

* use relative imports

Author: pwall2222

pykeepass/__init__.py

@@ -1,4 +1,4 @@
 from __future__ import absolute_import
 from .pykeepass import PyKeePass, create_database
 
-from pykeepass.version import __version__
+from .version import __version__

pykeepass/attachment.py

@@ -1,6 +1,5 @@
-import pykeepass.entry
-
-from pykeepass.exceptions import BinaryError
+from . import entry
+from .exceptions import BinaryError
 
 class Attachment(object):
     def __init__(self, element=None, kp=None, id=None, filename=None):
@@ -32,7 +31,7 @@ def filename(self, filename):
     def entry(self):
         """Entry: get entry this attachment is associated with"""
         ancestor = self._element.getparent()
-        return pykeepass.entry.Entry(element=ancestor, kp=self._kp)
+        return entry.Entry(element=ancestor, kp=self._kp)
 
     @property
     def binary(self):

pykeepass/baseelement.py

@@ -1,5 +1,4 @@
 import base64
-import struct
 import uuid
 from lxml import etree
 from lxml.builder import E

pykeepass/entry.py

@@ -1,14 +1,12 @@
 import logging
 from copy import deepcopy
-from datetime import datetime
 
 from lxml.builder import E
 from lxml.etree import Element, _Element
 from lxml.objectify import ObjectifiedElement
 
-import pykeepass.attachment
-import pykeepass.group
-from pykeepass.baseelement import BaseElement
+from . import attachment
+from .baseelement import BaseElement
 
 logger = logging.getLogger(__name__)
 reserved_keys = [
@@ -128,7 +126,7 @@ def add_attachment(self, id, filename):
         )
         self._element.append(element)
 
-        return pykeepass.attachment.Attachment(element=element, kp=self._kp)
+        return attachment.Attachment(element=element, kp=self._kp)
 
     def delete_attachment(self, attachment):
         attachment.delete()

pykeepass/group.py

@@ -2,8 +2,8 @@
 from lxml.etree import Element, _Element
 from lxml.objectify import ObjectifiedElement
 
-import pykeepass.entry
-from pykeepass.baseelement import BaseElement
+from .entry import Entry
+from .baseelement import BaseElement
 
 
 class Group(BaseElement):
@@ -55,7 +55,7 @@ def notes(self, value):
     @property
     def entries(self):
         """:obj:`list` of :obj:`Entry`: get list of entries in this group"""
-        return [pykeepass.entry.Entry(element=x, kp=self._kp) for x in self._element.findall('Entry')]
+        return [Entry(element=x, kp=self._kp) for x in self._element.findall('Entry')]
 
     @property
     def subgroups(self):

pykeepass/kdbx_parsing/__init__.py

@@ -1 +1,4 @@
 from .kdbx import KDBX
+from .kdbx4 import kdf_uuids
+
+__all__ = ["KDBX", "kdf_uuids"]

pykeepass/pykeepass.py

@@ -10,20 +10,18 @@
 
 from binascii import Error as BinasciiError
 from construct import Container, ChecksumError, CheckError
-from copy import deepcopy
 from dateutil import parser, tz
 from datetime import datetime, timedelta
 from lxml import etree
 from lxml.builder import E
 from pathlib import Path
 
-from pykeepass.attachment import Attachment
-from pykeepass.entry import Entry
-from pykeepass.exceptions import *
-from pykeepass.group import Group
-from pykeepass.kdbx_parsing.kdbx import KDBX
-from pykeepass.kdbx_parsing.kdbx4 import kdf_uuids
-from pykeepass.xpath import attachment_xp, entry_xp, group_xp, path_xp
+from .attachment import Attachment
+from .entry import Entry
+from .exceptions import *
+from .group import Group
+from .kdbx_parsing import KDBX, kdf_uuids
+from .xpath import attachment_xp, entry_xp, group_xp, path_xp
 
 logger = logging.getLogger(__name__)