[Python-modules-commits] [python-keyring] 01/01: New upstream version 10.5.1

[Dmitry Shachnev]

This is an automated email from the git hooks/post-receive script.

mitya57 pushed a commit to branch upstream
in repository python-keyring.

commit 2c90435de2722308c87f3e0d87930c0282ab83aa
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Dec 16 00:30:08 2017 +0300

    New upstream version 10.5.1
---
 .travis.yml                       | 8 +++++---
 CHANGES.rst                       | 6 ++++++
 PKG-INFO                          | 2 +-
 docs/conf.py                      | 6 +++---
 keyring.egg-info/PKG-INFO         | 2 +-
 keyring/backends/SecretService.py | 3 +++
 keyring/backends/kwallet.py       | 3 +++
 setup.cfg                         | 3 +++
 8 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f0b5fb5..a2c0c5d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,15 @@
 language: python
 
+python:
+- 2.7
+- &latest_py3 3.6
+
 jobs:
   fast_finish: true
   include:
-  - python: 2.7
-  - python: 3.3
-  - python: &latest_py3 3.6
   - os: osx
     language: generic
+    python: *latest_py3
   - stage: deploy
     if: tag IS present
     python: *latest_py3
diff --git a/CHANGES.rst b/CHANGES.rst
index 8125e29..6bcf5c2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+10.5.1
+------
+
+* #296: Prevent AttributeError on import when Debian has
+  created broken dbus installs.
+
 10.5.0
 ------
 
diff --git a/PKG-INFO b/PKG-INFO
index 2e3143e..cf872c9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: keyring
-Version: 10.5.0
+Version: 10.5.1
 Summary: Store and access your passwords safely.
 Home-page: https://github.com/jaraco/keyring
 Author: Jason R. Coombs
diff --git a/docs/conf.py b/docs/conf.py
index 8bc8298..14744ee 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -2,9 +2,9 @@
 # -*- coding: utf-8 -*-
 
 extensions = [
-    'sphinx.ext.autodoc',
-    'jaraco.packaging.sphinx',
-    'rst.linker',
+	'sphinx.ext.autodoc',
+	'jaraco.packaging.sphinx',
+	'rst.linker',
 ]
 
 master_doc = 'index'
diff --git a/keyring.egg-info/PKG-INFO b/keyring.egg-info/PKG-INFO
index 2e3143e..cf872c9 100644
--- a/keyring.egg-info/PKG-INFO
+++ b/keyring.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: keyring
-Version: 10.5.0
+Version: 10.5.1
 Summary: Store and access your passwords safely.
 Home-page: https://github.com/jaraco/keyring
 Author: Jason R. Coombs
diff --git a/keyring/backends/SecretService.py b/keyring/backends/SecretService.py
index e584be3..ca843f3 100644
--- a/keyring/backends/SecretService.py
+++ b/keyring/backends/SecretService.py
@@ -13,6 +13,9 @@ try:
     import secretstorage.exceptions as exceptions
 except ImportError:
     pass
+except AttributeError:
+    # See https://github.com/jaraco/keyring/issues/296
+    pass
 
 log = logging.getLogger(__name__)
 
diff --git a/keyring/backends/kwallet.py b/keyring/backends/kwallet.py
index 76ee92d..9e67733 100644
--- a/keyring/backends/kwallet.py
+++ b/keyring/backends/kwallet.py
@@ -13,6 +13,9 @@ try:
     from dbus.mainloop.glib import DBusGMainLoop
 except ImportError:
     pass
+except AttributeError:
+    # See https://github.com/jaraco/keyring/issues/296
+    pass
 
 
 class DBusKeyring(KeyringBackend):
diff --git a/setup.cfg b/setup.cfg
index 83a4fa9..6e564b3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,6 +5,9 @@ dists = clean --all sdist bdist_wheel
 [bdist_wheel]
 universal = 1
 
+[metadata]
+license_file = LICENSE
+
 [egg_info]
 tag_build = 
 tag_date = 0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-keyring.git