| 
				
			 | 
			
			
				@@ -66,9 +66,9 @@ class PluginData(object): 
			 | 
		
	
		
			
			| 
				66
			 | 
			
				66
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				67
			 | 
			
				67
			 | 
			
			
				 class Subcommand(object): 
			 | 
		
	
		
			
			| 
				68
			 | 
			
				68
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				69
			 | 
			
				
			 | 
			
			
				-    def __init__(self, args, pluginpath): 
			 | 
		
	
		
			
			| 
				70
			 | 
			
				
			 | 
			
			
				-        self.plugindata = PluginData(args) 
			 | 
		
	
		
			
			| 
				71
			 | 
			
				
			 | 
			
			
				-        self.name = args['<command>'] 
			 | 
		
	
		
			
			| 
				
			 | 
			
				69
			 | 
			
			
				+    def __init__(self, cmdargs, pluginpath): 
			 | 
		
	
		
			
			| 
				
			 | 
			
				70
			 | 
			
			
				+        self.plugindata = PluginData(cmdargs) 
			 | 
		
	
		
			
			| 
				
			 | 
			
				71
			 | 
			
			
				+        self.name = cmdargs['<command>'] 
			 | 
		
	
		
			
			| 
				72
			 | 
			
				72
			 | 
			
			
				         self._load_plugin(pluginpath) 
			 | 
		
	
		
			
			| 
				73
			 | 
			
				73
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				74
			 | 
			
				74
			 | 
			
			
				     def _load_plugin(self, pluginpath): 
			 | 
		
	
	
		
			
			| 
				
			 | 
			
			
				@@ -93,9 +93,9 @@ class Subcommand(object): 
			 | 
		
	
		
			
			| 
				93
			 | 
			
				93
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				94
			 | 
			
				94
			 | 
			
			
				 class App: 
			 | 
		
	
		
			
			| 
				95
			 | 
			
				95
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				96
			 | 
			
				
			 | 
			
			
				-    def __init__(self, args): 
			 | 
		
	
		
			
			| 
				
			 | 
			
				96
			 | 
			
			
				+    def __init__(self, cmdargs): 
			 | 
		
	
		
			
			| 
				97
			 | 
			
				97
			 | 
			
			
				         self._set_pluginpath() 
			 | 
		
	
		
			
			| 
				98
			 | 
			
				
			 | 
			
			
				-        self.subcommand = Subcommand(args, self.pluginpath) 
			 | 
		
	
		
			
			| 
				
			 | 
			
				98
			 | 
			
			
				+        self.subcommand = Subcommand(cmdargs, self.pluginpath) 
			 | 
		
	
		
			
			| 
				99
			 | 
			
				99
			 | 
			
			
				  
			 | 
		
	
		
			
			| 
				100
			 | 
			
				100
			 | 
			
			
				     def _set_pluginpath(self): 
			 | 
		
	
		
			
			| 
				101
			 | 
			
				101
			 | 
			
			
				         mypath = os.path.dirname(os.path.realpath(sys.argv[0])) 
			 |