Merge branch 'fix/gui-update'

* fix/gui-update:
  catch non IO errors in gui_github_versioninfo()
  wrap whole of gui_github_versioninfo in try
  fix one final missing import IJ in gui update

cmtkgui.py

@@ -154,6 +154,7 @@ def install_dir():
 
 def gui_install_dir():
 	'''return sensible location to install CMTK GUI'''
+	from ij import IJ
 	pluginsdir=IJ.getDirectory('plugins')
 	return os.path.join(pluginsdir,'Scripts','Plugins','CMTK_Registration')
 
@@ -252,16 +253,19 @@ def gui_github_versioninfo():
 	Create a dictionary containing version information for current
 	github code
 	'''
-	try: u = urllib2.urlopen(gui_tarball_url)
+	try:
+		u = urllib2.urlopen(gui_tarball_url)
+		headers = u.info()
+		date = headers['date']
+		size = int(headers['Content-Length'])
+		filename = re.sub(".*filename=","",headers['Content-Disposition'])
+		u.close()
+		abbrev_sha1 = re.sub(".*-([a-f0-9]+).tar.gz","\\1",filename)
+		return {'abbrev_sha1':abbrev_sha1, 'filename':filename, 'date':date, 'size':size}
 	except IOError, e:
 		myErr("Unable to read github repository")
-	headers = u.info()
-	date = headers['date']
-	size = int(headers['Content-Length'])
-	filename = re.sub(".*filename=","",headers['Content-Disposition'])
-	u.close()
-	abbrev_sha1 = re.sub(".*-([a-f0-9]+).tar.gz","\\1",filename)
-	return {'abbrev_sha1':abbrev_sha1, 'filename':filename, 'date':date, 'size':size}
+	except :
+		myErr("Trouble parsing github return information")
 
 def gui_local_versioninfo():
 	'''