Revert "docker.py: Python 2.6 argparse compatibility"
This reverts commit c2d3189667409561772e8c1e5615c5166cd8aa2c. scripts/argparse.py was removed from the tree, so we don't need this hack anymore. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <20180618225131.13113-3-ehabkost@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
		
							parent
							
								
									8d0ea57ad4
								
							
						
					
					
						commit
						ae68fdaba9
					
				@ -14,14 +14,12 @@
 | 
				
			|||||||
from __future__ import print_function
 | 
					from __future__ import print_function
 | 
				
			||||||
import os
 | 
					import os
 | 
				
			||||||
import sys
 | 
					import sys
 | 
				
			||||||
sys.path.append(os.path.join(os.path.dirname(__file__),
 | 
					 | 
				
			||||||
                             '..', '..', 'scripts'))
 | 
					 | 
				
			||||||
import argparse
 | 
					 | 
				
			||||||
import subprocess
 | 
					import subprocess
 | 
				
			||||||
import json
 | 
					import json
 | 
				
			||||||
import hashlib
 | 
					import hashlib
 | 
				
			||||||
import atexit
 | 
					import atexit
 | 
				
			||||||
import uuid
 | 
					import uuid
 | 
				
			||||||
 | 
					import argparse
 | 
				
			||||||
import tempfile
 | 
					import tempfile
 | 
				
			||||||
import re
 | 
					import re
 | 
				
			||||||
import signal
 | 
					import signal
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user