Merge lp:~cloudysky/anonplus/quickfix into lp:anonplus

[Cloudy Sky]

I fixed a bug I caught with the unit tests.

[lp:~cloudysky/anonplus/quickfix]

245. By Cloudy Sky on 2012-06-30

keys.json was going to the wrong place

[aj00200 (aj00200)]

Everything is ok here. Thanks for the fix.

review: Approve

=== modified file 'src/libs/__init__.py'
--- src/libs/__init__.py	2012-04-24 22:25:18 +0000
+++ src/libs/__init__.py	2012-06-30 19:48:18 +0000
@@ -31,9 +31,9 @@
             with open(self.path, 'r') as config_file:
                 values = json.loads(config_file.read())
         except IOError:
-            vomundir = os.path.expanduser('~')
-            self['vomundir'] = os.path.join(vomundir, '.vomun')
-            self['keyfile'] = os.path.expanduser(vomundir, 'keys.json')
+            homedir = os.path.expanduser('~')
+            self['vomundir'] = os.path.join(homedir, '.vomun')
+            self['keyfile'] = os.path.join(self['vomundir'], 'keys.json')
             self['nodekey'] = ''
             self.save()
         else: