| 1 |
commit: 35ecad248a81436dcad7e6b9928ed3eeb098c9af |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 20 17:44:59 2015 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 30 23:29:06 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=35ecad24 |
| 7 |
|
| 8 |
gkeys/seed.py: Replace codecs usage with unicode() |
| 9 |
|
| 10 |
Add a noop for an empty kwargs[key]. |
| 11 |
|
| 12 |
jgjhgj |
| 13 |
|
| 14 |
gkeys/gkeys/seed.py | 4 +++- |
| 15 |
1 file changed, 3 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/gkeys/gkeys/seed.py b/gkeys/gkeys/seed.py |
| 18 |
index 985f6a1..01ca5a5 100644 |
| 19 |
--- a/gkeys/gkeys/seed.py |
| 20 |
+++ b/gkeys/gkeys/seed.py |
| 21 |
@@ -36,7 +36,7 @@ if sys.version_info[0] >= 3: |
| 22 |
return text |
| 23 |
else: |
| 24 |
def decoder(text, enc='utf_8'): |
| 25 |
- return codecs.decode(text, enc) |
| 26 |
+ return unicode(text) |
| 27 |
|
| 28 |
|
| 29 |
class Seeds(object): |
| 30 |
@@ -155,6 +155,8 @@ class Seeds(object): |
| 31 |
keys = kwargs |
| 32 |
result = self.seeds |
| 33 |
for key in keys: |
| 34 |
+ if not kwargs[key]: |
| 35 |
+ continue |
| 36 |
if key in ['fingerprint', 'keys', 'keyid']: |
| 37 |
kwargs[key] = [x.replace(' ', '').upper() for x in kwargs[key]] |
| 38 |
if key in ['fingerprint', 'keys', 'uid']: |
Archives