python: futurize -f lib2to3.fixes.fix_standarderror
Rename StandardError to Exception.
This is necessary for Python 3 compatibility.
Done using:
  $ py=$( (g grep -l -E '^#!.*python';find -name '*.py' -printf '%P\n';) | \
    sort -u | grep -v README.sh4)
  $ futurize -w -f lib2to3.fixes.fix_standarderror $py
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180608122952.2009-6-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
			
			
This commit is contained in:
		
							parent
							
								
									d7a4228ebb
								
							
						
					
					
						commit
						050c5d865e
					
				@ -137,7 +137,7 @@ class QemuGuestAgentClient:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    def fsfreeze(self, cmd):
 | 
					    def fsfreeze(self, cmd):
 | 
				
			||||||
        if cmd not in ['status', 'freeze', 'thaw']:
 | 
					        if cmd not in ['status', 'freeze', 'thaw']:
 | 
				
			||||||
            raise StandardError('Invalid command: ' + cmd)
 | 
					            raise Exception('Invalid command: ' + cmd)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return getattr(self.qga, 'fsfreeze' + '_' + cmd)()
 | 
					        return getattr(self.qga, 'fsfreeze' + '_' + cmd)()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -146,7 +146,7 @@ class QemuGuestAgentClient:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    def suspend(self, mode):
 | 
					    def suspend(self, mode):
 | 
				
			||||||
        if mode not in ['disk', 'ram', 'hybrid']:
 | 
					        if mode not in ['disk', 'ram', 'hybrid']:
 | 
				
			||||||
            raise StandardError('Invalid mode: ' + mode)
 | 
					            raise Exception('Invalid mode: ' + mode)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        try:
 | 
					        try:
 | 
				
			||||||
            getattr(self.qga, 'suspend' + '_' + mode)()
 | 
					            getattr(self.qga, 'suspend' + '_' + mode)()
 | 
				
			||||||
@ -157,7 +157,7 @@ class QemuGuestAgentClient:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    def shutdown(self, mode='powerdown'):
 | 
					    def shutdown(self, mode='powerdown'):
 | 
				
			||||||
        if mode not in ['powerdown', 'halt', 'reboot']:
 | 
					        if mode not in ['powerdown', 'halt', 'reboot']:
 | 
				
			||||||
            raise StandardError('Invalid mode: ' + mode)
 | 
					            raise Exception('Invalid mode: ' + mode)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        try:
 | 
					        try:
 | 
				
			||||||
            self.qga.shutdown(mode=mode)
 | 
					            self.qga.shutdown(mode=mode)
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user