fix provision in python 3.x (urlparse is 2.x only)

exosite-archive · Oct 29, 2014 · e3d2105 · e3d2105
1 parent d11e2af
commit e3d2105
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/exoline/plugins/provision.py b/exoline/plugins/provision.py
@@ -20,7 +20,7 @@
     exo [options] provision sn delrange <model> <format> <first> <last> [--length=<digits>] [(--uppercase | --lowercase)]
     exo [options] provision sn regen <model> <sn>
     exo [options] provision sn disable <model> <sn>
-	exo [options] provision sn activate <vendor> <model> <sn>
+    exo [options] provision sn activate <vendor> <model> <sn>
 
 Command Options:
     -l --long       Long listing
@@ -39,7 +39,11 @@
 import re
 import json
 import urllib, mimetypes
-import urlparse
+import six
+if six.PY3:
+	import urllib.parse as urlparse
+else:
+	import urlparse
 import time
 
 class Plugin():
@@ -126,7 +130,7 @@ def humanSize(size):
 				for afile in files:
 					mlist = pop.content_info(key, args['<model>'], afile)
 					mime,size,updated,meta,protected = mlist.body.strip().split(',')
-					
+
 					# Format into human sizes
 					size = humanSize(size)
 					# Format into Human time