Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use upstream dbus-next #26

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions .travis.yml

This file was deleted.

1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions pass_secret_service/common/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
2 changes: 0 additions & 2 deletions pass_secret_service/common/names.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
2 changes: 0 additions & 2 deletions pass_secret_service/common/pass_store.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
2 changes: 0 additions & 2 deletions pass_secret_service/common/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
2 changes: 0 additions & 2 deletions pass_secret_service/interfaces/collection.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
2 changes: 0 additions & 2 deletions pass_secret_service/interfaces/item.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
2 changes: 0 additions & 2 deletions pass_secret_service/interfaces/service.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
2 changes: 0 additions & 2 deletions pass_secret_service/interfaces/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
2 changes: 0 additions & 2 deletions pass_secret_service/pass_secret_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 :
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
git+https://github.com/mdellweg/python-dbus-next@master
.

This comment was marked as resolved.

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The dependency is already declared in setup.py.

coverage
pycodestyle
Expand Down
6 changes: 2 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from setuptools import setup # pragma: no cover
from setuptools import setup


def read_file(file_name):
with open(file_name) as f:
return f.read()


setup( # pragma: no cover
setup(
name='pass_secret_service',
version='0.1a0',
description=read_file('README.md'),
Expand All @@ -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 :