[Python-modules-commits] [python-keyring] 01/04: Import python-keyring_8.5.orig.tar.gz

[Dmitry Shachnev]

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

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

commit 6f63339b63c07b0ebb5f63608cea0f582ff39bd9
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Mar 12 09:24:06 2016 +0100

    Import python-keyring_8.5.orig.tar.gz
---
 .hgtags                     |  1 +
 .travis.yml                 | 34 ++++++++++++++++++++++++++--------
 CHANGES.rst                 |  7 +++++++
 PKG-INFO                    |  2 +-
 keyring.egg-info/PKG-INFO   |  2 +-
 keyring/backends/OS_X.py    |  4 ++--
 keyring/backends/kwallet.py | 11 ++++++-----
 setup.cfg                   |  4 ++--
 8 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/.hgtags b/.hgtags
index 5740df7..8fb34e1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -105,3 +105,4 @@ dbc981b43088e635228899e779747ce0eafde491 8.1
 d225d8ba8a020eed8170389090a5a82abc38289b 8.3
 f9004a4c72d1e41f473eef3fefa7b596b30d9259 8.4
 6ddcb034223246c4b67d9caea3f0deb18f462c59 8.4.1
+5f0cc53d698fcac4174bc54ae84b3478cb5cd06e 8.5
diff --git a/.travis.yml b/.travis.yml
index f564903..1b6ec80 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,30 @@
-os:
-  - linux
+# https://travis-ci.org/#!/jaraco/keyring
+#
+
 language: python
-python:
-  - 2.7
-  - 3.2
-  - 3.3
-  - 3.4
-  - 3.5
+
+matrix:
+    include:
+        - os: linux
+          python: 2.7
+        - os: linux
+          python: 3.2
+        - os: linux
+          python: 3.3
+        - os: linux
+          python: 3.4
+        - os: linux
+          python: 3.5
+        - os: osx
+          language: generic
+
+# Perform the manual steps on osx to install python3 and activate venv
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python3; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then python3 -m venv /tmp/.env; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then source /tmp/.env/bin/activate; fi
+
 script:
   - pip install -U pytest
   - python setup.py test --addopts="-rs -v"
diff --git a/CHANGES.rst b/CHANGES.rst
index 0b490ae..8e4a2a4 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -3,6 +3,13 @@ CHANGES
 =======
 
 ---
+8.5
+---
+
+* Issue #168: Now prefer KF5 Kwallet to KF4. Users relying
+  on KF4 must use prior releases.
+
+---
 8.4
 ---
 
diff --git a/PKG-INFO b/PKG-INFO
index af56447..e7a7791 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: keyring
-Version: 8.4.1
+Version: 8.5
 Summary: Store and access your passwords safely.
 Home-page: https://github.com/jaraco/keyring
 Author: Jason R. Coombs
diff --git a/keyring.egg-info/PKG-INFO b/keyring.egg-info/PKG-INFO
index af56447..e7a7791 100644
--- a/keyring.egg-info/PKG-INFO
+++ b/keyring.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: keyring
-Version: 8.4.1
+Version: 8.5
 Summary: Store and access your passwords safely.
 Home-page: https://github.com/jaraco/keyring
 Author: Jason R. Coombs
diff --git a/keyring/backends/OS_X.py b/keyring/backends/OS_X.py
index d1814ef..729a125 100644
--- a/keyring/backends/OS_X.py
+++ b/keyring/backends/OS_X.py
@@ -122,7 +122,7 @@ class Keyring(KeyringBackend):
                 stdout=subprocess.PIPE)
             stdoutdata, stderrdata = call.communicate()
             code = call.returncode
-            if code is not 0:
+            if code != 0:
                 raise OSError("Can't fetch password from system")
             output = stderrdata.decode()
             # check for empty password.
@@ -163,7 +163,7 @@ class Keyring(KeyringBackend):
             stdoutdata, stderrdata = call.communicate()
             code = call.returncode
             # check return code.
-            if code is not 0:
+            if code != 0:
                 raise del_error
         except:
             raise del_error
diff --git a/keyring/backends/kwallet.py b/keyring/backends/kwallet.py
index 45e810a..2b564a0 100644
--- a/keyring/backends/kwallet.py
+++ b/keyring/backends/kwallet.py
@@ -14,6 +14,9 @@ except ImportError:
 class DBusKeyring(KeyringBackend):
     """KDE KWallet via D-Bus"""
 
+    folder = 'Python'
+    appid = 'Python program'
+
     @properties.ClassProperty
     @classmethod
     def priority(cls):
@@ -24,9 +27,9 @@ class DBusKeyring(KeyringBackend):
         except dbus.DBusException as exc:
             raise RuntimeError(exc.get_dbus_message())
         try:
-            bus.get_object('org.kde.kwalletd', '/modules/kwalletd')
+            bus.get_object('org.kde.kwalletd5', '/modules/kwalletd5')
         except dbus.DBusException:
-            raise RuntimeError('cannot connect to org.kde.kwalletd')
+            raise RuntimeError('cannot connect to org.kde.kwalletd5')
         return 5.1
 
     def __init__(self, *arg, **kw):
@@ -38,10 +41,8 @@ class DBusKeyring(KeyringBackend):
             return True
         bus = dbus.SessionBus()
         wId = 0
-        self.folder = 'Python'
-        self.appid = 'Python program'
         try:
-            remote_obj = bus.get_object('org.kde.kwalletd', '/modules/kwalletd')
+            remote_obj = bus.get_object('org.kde.kwalletd5', '/modules/kwalletd5')
             self.iface = dbus.Interface(remote_obj, 'org.kde.KWallet')
             self.handle = self.iface.open(
                         self.iface.networkWallet(), wId, self.appid)
diff --git a/setup.cfg b/setup.cfg
index 4d55109..5532539 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,12 +1,12 @@
 [aliases]
-release = sdist bdist_wheel build_sphinx upload upload_docs
+release = clean --all sdist bdist_wheel build_sphinx upload upload_docs
 test = pytest
 
 [wheel]
 universal = 1
 
 [egg_info]
+tag_svn_revision = 0
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 

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