mirror of
				https://github.com/kewlfft/ansible-aur.git
				synced 2025-11-04 10:02:30 +03:00 
			
		
		
		
	avoid dependency to six by replacing urlopen with open_url
This commit is contained in:
		
							
								
								
									
										11
									
								
								aur.py
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								aur.py
									
									
									
									
									
								
							@@ -1,9 +1,12 @@
 | 
				
			|||||||
#!/usr/bin/env python
 | 
					#!/usr/bin/env python
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from ansible.module_utils.basic import *
 | 
					from ansible.module_utils.basic import *
 | 
				
			||||||
 | 
					from ansible.module_utils.urls import open_url
 | 
				
			||||||
import json
 | 
					import json
 | 
				
			||||||
from ansible.module_utils import six
 | 
					# try:
 | 
				
			||||||
from six.moves import urllib
 | 
					#     from urllib.request import urlopen
 | 
				
			||||||
 | 
					# except ImportError:
 | 
				
			||||||
 | 
					#     from urllib2 import urlopen
 | 
				
			||||||
import tarfile
 | 
					import tarfile
 | 
				
			||||||
import os
 | 
					import os
 | 
				
			||||||
import os.path
 | 
					import os.path
 | 
				
			||||||
@@ -62,12 +65,12 @@ def install_with_makepkg(module, package):
 | 
				
			|||||||
    """
 | 
					    """
 | 
				
			||||||
    Install the specified package with makepkg
 | 
					    Install the specified package with makepkg
 | 
				
			||||||
    """
 | 
					    """
 | 
				
			||||||
    f = urllib.request.urlopen('https://aur.archlinux.org/rpc/?v=5&type=info&arg={}'.format(package))
 | 
					    f = open_url('https://aur.archlinux.org/rpc/?v=5&type=info&arg={}'.format(package))
 | 
				
			||||||
    result = json.loads(f.read().decode('utf8'))
 | 
					    result = json.loads(f.read().decode('utf8'))
 | 
				
			||||||
    if result['resultcount'] != 1:
 | 
					    if result['resultcount'] != 1:
 | 
				
			||||||
        return (1, '', 'package not found')
 | 
					        return (1, '', 'package not found')
 | 
				
			||||||
    result = result['results'][0]
 | 
					    result = result['results'][0]
 | 
				
			||||||
    f = urllib.request.urlopen('https://aur.archlinux.org/{}'.format(result['URLPath']))
 | 
					    f = open_url('https://aur.archlinux.org/{}'.format(result['URLPath']))
 | 
				
			||||||
    current_path = os.getcwd()
 | 
					    current_path = os.getcwd()
 | 
				
			||||||
    with tempfile.TemporaryDirectory() as tmpdir:
 | 
					    with tempfile.TemporaryDirectory() as tmpdir:
 | 
				
			||||||
        os.chdir(tmpdir)
 | 
					        os.chdir(tmpdir)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user