Gentoo Archives: gentoo-commits

From: Brian Dolbec <dolsen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gentoo-keys:master commit in: gkeys/gkeys/
Date: Fri, 06 Mar 2015 21:04:41
Message-Id: 1425675826.104269d7a6bf20cc0a618ba9194c2be6e2970abe.dolsen@gentoo
1 commit: 104269d7a6bf20cc0a618ba9194c2be6e2970abe
2 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 6 21:03:46 2015 +0000
4 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 6 21:03:46 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=104269d7
7
8 gkeys/seed.py: Revert the use of codecs to open the seed file
9
10 It was causing tracebacks in python-2.7 running in vulture.gentoo.org
11
12 gkeys/gkeys/seed.py | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15 diff --git a/gkeys/gkeys/seed.py b/gkeys/gkeys/seed.py
16 index 262ba57..ca5e2d2 100644
17 --- a/gkeys/gkeys/seed.py
18 +++ b/gkeys/gkeys/seed.py
19 @@ -61,7 +61,7 @@ class Seeds(object):
20 seedlines = None
21 self.seeds = {}
22 try:
23 - with codecs.open(self.filename, "r+", encoding='utf_8') as seedfile:
24 + with open(self.filename, "r+") as seedfile:
25 seedlines = json.load(seedfile)
26 except IOError as err:
27 self.logger.debug("Seed: load; IOError occurred while loading file")
28 @@ -104,7 +104,7 @@ class Seeds(object):
29 fatal=True)
30 os.umask(int(self.config.get_key("permissions", "files"),0))
31 try:
32 - with codecs.open(self.filename, 'w', encoding='utf_8') as seedfile:
33 + with open(self.filename, 'w') as seedfile:
34 seedfile.write(self._seeds2json(self.seeds))
35 seedfile.write("\n")
36 except IOError as err: