Merge lp:~aj00200/anonplus/setup-bugs into lp:anonplus

[aj00200]

Fixed numerous issues with setup.py that would cause more obscure crashes in the event that something did not go right. These bugs were caused by incorrect code in the try blocks.

This change fixed some bugs in setup.py that would only show up if there was an error during the installation. These were all caught by pylint.

[aj00200 (aj00200)]

Everything looks good.

review: Approve

=== modified file 'src/setup.py'
--- src/setup.py	2011-12-20 02:18:14 +0000
+++ src/setup.py	2012-02-22 02:05:20 +0000
@@ -23,7 +23,7 @@
     import Crypto
     import Crypto.PublicKey.RSA
 except ImportError:
-    raise libs.errors.DependancyError(_('''PyCrypto is required to use Anon+
+    raise Exception(_('''PyCrypto is required to use Anon+
         Get it for Linux at https://www.dlitz.net/software/pycrypto/
         Get it for Windows at http://www.voidspace.org.uk/python/modules.shtml#pycrypto
     '''))
@@ -31,7 +31,7 @@
 # Check PyCrypto version basics - require v2.4.x or higher
 # The version in PyCrypto is incorrect. See bug #892944
 if Crypto.version_info[0] < 2 or Crypto.version_info[1] < 1:
-    raise libs.errors.DependancyError(_(
+    raise Exception(_(
             'Please update PyCrypto: https://www.dlitz.net/software/pycrypto/'))
 
 ## Prepare for setup
@@ -53,7 +53,7 @@
         print(_('  [*] %s already exists. Do not need to create.' % VOMUN_PATH))
     else:
         print(_('  [*] Error creating %s' % VOMUN_PATH))
-        raise libs.errors.InstallError(_(
+        raise Exception(_(
                      'Please check your file permissions for %s' % HOME))
 
 ## Key setup
@@ -70,10 +70,10 @@
 try:
     pubkey = keys['nodekey'].publickey().exportKey()
 except AttributeError:
-    raise libs.errors.DependancyError(_(
+    raise Exception(_(
         'Please update PyCrypto: https://www.dlitz.net/software/pycrypto/'))
 else:
-	keys['nodekey'].hash = hashlib.sha256(pubkey).hexdigest()
+    keys['nodekey'].hash = hashlib.sha256(pubkey).hexdigest()
 
 print(_('  [*] Done. Key fingerprint:'))
 print('      %s' % keys['nodekey'].hash)
@@ -104,8 +104,8 @@
     key_file.write(json.dumps(keys_by_hash, indent = 4))
     key_file.close()
 except IOError:
-    print(_('  [*] Error writing %s. Check file permissions.' % KEY_PATH))
-    raise libs.errors.InstallError(_('Could not write to %s.' % KEY_PATH))
+    print(_('  [*] Error writing %s. Check file permissions.' % KEYS_PATH))
+    raise Exception(_('Could not write to %s.' % KEYS_PATH))
 
 
 ## Configuration
@@ -126,16 +126,16 @@
     config_file.close()
 except IOError as error:
     print(_('  [*] Error writing %s. Check file permissions.' % CONFIG_PATH))
-    raise libs.errors.InstallError(_('Could not write to %s.' % CONFIG_PATH))
+    raise Exception(_('Could not write to %s.' % CONFIG_PATH))
 
 friendlistpath = os.path.join(VOMUN_PATH, 'friends.json')
 try:
-        friendlistr = open(friendlistpath, "r")
-        friendlistr.close()
+    friendlistr = open(friendlistpath, "r")
+    friendlistr.close()
 except IOError:
-        friendlistr = open(friendlistpath, "w")
-        friendlistr.write('[]')
-        friendlistr.close()
+    friendlistr = open(friendlistpath, "w")
+    friendlistr.write('[]')
+    friendlistr.close()
 
 ## Setup complete
 print(_(' == Setup Complete =='))