Format code

yunohost

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-__credits__ = '''Copyright (C) 2012 YunoHost
+__credits__ = """Copyright (C) 2012 YunoHost
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as published
@@ -15,9 +15,9 @@ __credits__ = '''Copyright (C) 2012 YunoHost
 
     You should have received a copy of the GNU Affero General Public License
     along with this program; if not, see http://www.gnu.org/licenses
-'''
+"""
 __author__  = 'Kload'
-__version__ = '2.0_beta1'
+__version__ = '2.0 beta1'
 
 import sys
 import argparse
@@ -25,7 +25,7 @@ sys.path.append('lib') # Local temporary hack
 
 
 def str_to_func(astr):
-    '''  Call a function from a string name
+    """Call a function from a string name
     
     Keyword arguments:
         astr -- Name of function to call
@@ -33,7 +33,7 @@ def str_to_func(astr):
     Returns: 
         Function
 
-    '''
+    """
     module, _, function = astr.rpartition('.')
     if module:
         __import__(module)
@@ -46,11 +46,12 @@ def str_to_func(astr):
     except NameError:
         print 'Error: Function ' + category + '_' + action + '() is not defined'
         sys.exit(1)
-    return func
+    else:
+        return func
 
 
 def dict_to_parsers(action_dict):
-    ''' Turn action dictionnary to parser and subparsers (2 level)
+    """Turn action dictionnary to parser and subparsers (2 level)
     
     Keyword arguments:
         action_dict -- Multi-level dictionnary of categories/actions list
@@ -58,7 +59,7 @@ def dict_to_parsers(action_dict):
     Returns: 
         Dictionnrary of parsers
 
-    '''
+    """
 
     # Intialize parsers
     parsers = subparsers_category = subparsers_action = dict()
@@ -67,17 +68,20 @@ def dict_to_parsers(action_dict):
 
     # Compute dictionnary
     for category, info in action_dict.items():
-        subparsers_category[category] = subparsers.add_parser(category, help = info['help'])
+        subparsers_category[category] = subparsers.add_parser(category, help=info['help'])
         subparsers_action[category] = subparsers_category[category].add_subparsers()
         for action, helper in info['actions'].items():
-            parsers[category + '_' + action] = subparsers_action[category].add_parser(action, help = helper)
-            parsers[category + '_' + action].set_defaults(func = str_to_func('yunohost_' + category + '.' + category + '_' + action)) 
+            parsers[category + '_' + action] = subparsers_action[category].add_parser(action, help=helper)
+            parsers[category + '_' + action].set_defaults(
+                func=str_to_func('yunohost_' + category 
+                                + '.' + category 
+                                + '_' + action)) 
 
     return parsers
 
 
 def parse_args(parsers):
-    ''' Add and parse arguments
+    """Add and parse arguments
 
     Keyword arguments:
         parsers -- parsers and subparsers as a dict    
@@ -93,14 +97,14 @@ def parse_args(parsers):
         http://docs.python.org/dev/library/argparse.html
         #argparse.ArgumentParser.add_argument 
      
-    '''
+    """
 
     # General
     parsers['general'].add_argument(
         '-v', 
         '--version', 
-        action = 'version',
-        version = '%(prog)s '+ __version__
+        action='version',
+        version='%(prog)s ' +  __version__
     )
 
 
@@ -108,7 +112,7 @@ def parse_args(parsers):
     parsers['user_list'].add_argument(
         '-a',
         '--all',
-        action = 'store'
+        action='store'
     )
 
     # Call arguments parsing
@@ -119,7 +123,8 @@ def parse_args(parsers):
 
 
 def main():
-    ''' Main instructions '''
+    """Main instructions
+    """
 
     action_dict = {
         'user' : {