From 7db11d11636da43e689e2ba7c4d1d88b67aa93e0 Mon Sep 17 00:00:00 2001 From: Matthias Dellweg <2500@gmx.de> Date: Sat, 30 Jan 2021 11:12:38 +0100 Subject: [PATCH] Use upstream dbus-next Cleanup some stuff. --- .travis.yml | 10 ---------- Makefile | 1 + pass_secret_service/common/exceptions.py | 2 -- pass_secret_service/common/names.py | 2 -- pass_secret_service/common/pass_store.py | 2 -- pass_secret_service/common/tools.py | 2 -- pass_secret_service/interfaces/collection.py | 2 -- pass_secret_service/interfaces/item.py | 2 -- pass_secret_service/interfaces/service.py | 2 -- pass_secret_service/interfaces/session.py | 2 -- pass_secret_service/pass_secret_service.py | 2 -- requirements.txt | 1 - setup.py | 6 ++---- 13 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 9861269..0000000 --- a/.travis.yml +++ /dev/null @@ -1,10 +0,0 @@ -sudo: false -dist: xenial -language: python -matrix: - include: - - python: "3.7" -install: - - pip install -r requirements.txt -script: - - make style coverage diff --git a/Makefile b/Makefile index 41d6653..178cc29 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,7 @@ $(relgnupghome): test/test_key.asc test/test_ownertrust.txt $(relpassstore): | $(relgnupghome) @echo "===== Preparing password store in $(relpassstore) =====" pypass init -p $(relpassstore) $(gpg_key_id) + pypass git init clean: clean-test-environment clean-pycache clean-build diff --git a/pass_secret_service/common/exceptions.py b/pass_secret_service/common/exceptions.py index c73e051..e47b68b 100644 --- a/pass_secret_service/common/exceptions.py +++ b/pass_secret_service/common/exceptions.py @@ -19,5 +19,3 @@ def __init__(self, path): class DBusErrorNoSuchObject(DBusError): def __init__(self, path): super().__init__("org.freedesktop.Secret.Error.NoSuchObject", "No such object: {}.".format(path)) - -# vim: set tw=160 sts=4 ts=8 sw=4 ft=python et noro norl cin si ai : diff --git a/pass_secret_service/common/names.py b/pass_secret_service/common/names.py index 5c2a51e..b03683c 100644 --- a/pass_secret_service/common/names.py +++ b/pass_secret_service/common/names.py @@ -6,5 +6,3 @@ COLLECTION_LABEL = 'org.freedesktop.Secret.Collection.Label' ITEM_LABEL = 'org.freedesktop.Secret.Item.Label' ITEM_ATTRIBUTES = 'org.freedesktop.Secret.Item.Attributes' - -# vim: set tw=160 sts=4 ts=8 sw=4 ft=python et noro norl cin si ai : diff --git a/pass_secret_service/common/pass_store.py b/pass_secret_service/common/pass_store.py index d5cd327..6a400cb 100644 --- a/pass_secret_service/common/pass_store.py +++ b/pass_secret_service/common/pass_store.py @@ -109,5 +109,3 @@ def update_item_properties(self, collection_name, name, new_properties): properties.update(new_properties) self.save_item_properties(collection_name, name, properties) return properties - -# vim: set tw=160 sts=4 ts=8 sw=4 ft=python et noro norl cin si ai : diff --git a/pass_secret_service/common/tools.py b/pass_secret_service/common/tools.py index 47f7dbf..9265583 100644 --- a/pass_secret_service/common/tools.py +++ b/pass_secret_service/common/tools.py @@ -15,5 +15,3 @@ class SerialMixin: def _serial(cls): cls._serial_count += 1 return cls._serial_count - -# vim: set tw=160 sts=4 ts=8 sw=4 ft=python et noro norl cin si ai : diff --git a/pass_secret_service/interfaces/collection.py b/pass_secret_service/interfaces/collection.py index 53b5f37..03fff16 100644 --- a/pass_secret_service/interfaces/collection.py +++ b/pass_secret_service/interfaces/collection.py @@ -155,5 +155,3 @@ def Created(self) -> 't': @dbus_property(access=PropertyAccess.READ) def Modified(self) -> 't': return 0 - -# vim: set tw=160 sts=4 ts=8 sw=4 ft=python et noro norl cin si ai : diff --git a/pass_secret_service/interfaces/item.py b/pass_secret_service/interfaces/item.py index 71be5aa..cbb57c9 100644 --- a/pass_secret_service/interfaces/item.py +++ b/pass_secret_service/interfaces/item.py @@ -139,5 +139,3 @@ def Created(self) -> 't': @dbus_property(access=PropertyAccess.READ) def Modified(self) -> 't': return 0 - -# vim: set tw=160 sts=4 ts=8 sw=4 ft=python et noro norl cin si ai : diff --git a/pass_secret_service/interfaces/service.py b/pass_secret_service/interfaces/service.py index 7ae488d..1e14911 100644 --- a/pass_secret_service/interfaces/service.py +++ b/pass_secret_service/interfaces/service.py @@ -253,5 +253,3 @@ def CollectionChanged(self, collection) -> 'o': @dbus_property(access=PropertyAccess.READ) def Collections(self) -> 'ao': return [collection.path for collection in self.collections.values()] - -# vim: set tw=160 sts=4 ts=8 sw=4 ft=python et noro norl cin si ai : diff --git a/pass_secret_service/interfaces/session.py b/pass_secret_service/interfaces/session.py index 67ef415..d874b28 100644 --- a/pass_secret_service/interfaces/session.py +++ b/pass_secret_service/interfaces/session.py @@ -80,5 +80,3 @@ async def Close(self) -> '': self.service.sessions.pop(self.id) # Deregister from dbus await self._unregister() - -# vim: set tw=160 sts=4 ts=8 sw=4 ft=python et noro norl cin si ai : diff --git a/pass_secret_service/pass_secret_service.py b/pass_secret_service/pass_secret_service.py index f6e78f2..ae0cbff 100755 --- a/pass_secret_service/pass_secret_service.py +++ b/pass_secret_service/pass_secret_service.py @@ -58,5 +58,3 @@ def main(path, verbose): if __name__ == '__main__': # pragma: no cover main() - -# vim: set tw=160 sts=4 ts=8 sw=4 ft=python et noro norl cin si ai : diff --git a/requirements.txt b/requirements.txt index c941b01..4ab0a5b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -git+https://github.com/mdellweg/python-dbus-next@master . coverage pycodestyle diff --git a/setup.py b/setup.py index f11779a..389f8a6 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -from setuptools import setup # pragma: no cover +from setuptools import setup def read_file(file_name): @@ -6,7 +6,7 @@ def read_file(file_name): return f.read() -setup( # pragma: no cover +setup( name='pass_secret_service', version='0.1a0', description=read_file('README.md'), @@ -31,5 +31,3 @@ def read_file(file_name): pass_secret_service=pass_secret_service:main ''', ) - -# vim: set tw=160 sts=4 ts=8 sw=4 ft=python et noro norl cin si ai :