Support Python 3.x
This commit is contained in:
		
							parent
							
								
									7d4acf3ff7
								
							
						
					
					
						commit
						de7faf462b
					
				
					 1 changed files with 10 additions and 3 deletions
				
			
		
							
								
								
									
										11
									
								
								check_kernel
									
										
									
									
									
								
							
							
						
						
									
										11
									
								
								check_kernel
									
										
									
									
									
								
							| 
						 | 
					@ -52,8 +52,15 @@ class Version(object):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def proc_version():
 | 
					def proc_version():
 | 
				
			||||||
 | 
					    """Return the content of /proc/version"""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    proc_version = None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Not using a with statement here, to support Python 2.4
 | 
				
			||||||
    v = open('/proc/version', 'r')
 | 
					    v = open('/proc/version', 'r')
 | 
				
			||||||
    proc_version = v.next()
 | 
					    try:
 | 
				
			||||||
 | 
					        proc_version = v.read()
 | 
				
			||||||
 | 
					    finally:
 | 
				
			||||||
        v.close()
 | 
					        v.close()
 | 
				
			||||||
    return proc_version
 | 
					    return proc_version
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -122,7 +129,7 @@ def installed_kernel_versions_debian():
 | 
				
			||||||
def installed_kernel_versions_fedora():
 | 
					def installed_kernel_versions_fedora():
 | 
				
			||||||
    rpm_out = check_output(
 | 
					    rpm_out = check_output(
 | 
				
			||||||
        ['rpm', '--queryformat=%{VERSION}-%{RELEASE}\n', '-q', 'kernel'])
 | 
					        ['rpm', '--queryformat=%{VERSION}-%{RELEASE}\n', '-q', 'kernel'])
 | 
				
			||||||
    rpm_out = rpm_out.strip()
 | 
					    rpm_out = rpm_out.decode('ascii', 'ignore').strip()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    versions = rpm_out.split('\n')
 | 
					    versions = rpm_out.split('\n')
 | 
				
			||||||
    versions = [clean_kernel_version(v) for v in versions]
 | 
					    versions = [clean_kernel_version(v) for v in versions]
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue