Improve python3 compatibility in webconfig.py

1 files changed, 175 insertions, 175 deletions

diff --git a/share/tools/web_config/webconfig.py b/share/tools/web_config/webconfig.py
index 6b124ef6..7b33664c 100755
--- a/share/tools/web_config/webconfig.py
+++ b/share/tools/web_config/webconfig.py
@@ -98,120 +98,120 @@ def parse_bool(val):
     return bool(val)
 
 def html_color_for_ansi_color_index(val):
-	arr = ['black', '#AA0000', '#00AA00', '#AA5500', '#0000AA', '#AA00AA', '#00AAAA', '#AAAAAA', '#555555', '#FF5555', '#55FF55', '#FFFF55', '#5555FF', '#FF55FF', '#55FFFF', 'white', '#000000', '#00005f', '#000087', '#0000af', '#0000d7', '#0000ff', '#005f00', '#005f5f', '#005f87', '#005faf', '#005fd7', '#005fff', '#008700', '#00875f', '#008787', '#0087af', '#0087d7', '#0087ff', '#00af00', '#00af5f', '#00af87', '#00afaf', '#00afd7', '#00afff', '#00d700', '#00d75f', '#00d787', '#00d7af', '#00d7d7', '#00d7ff', '#00ff00', '#00ff5f', '#00ff87', '#00ffaf', '#00ffd7', '#00ffff', '#5f0000', '#5f005f', '#5f0087', '#5f00af', '#5f00d7', '#5f00ff', '#5f5f00', '#5f5f5f', '#5f5f87', '#5f5faf', '#5f5fd7', '#5f5fff', '#5f8700', '#5f875f', '#5f8787', '#5f87af', '#5f87d7', '#5f87ff', '#5faf00', '#5faf5f', '#5faf87', '#5fafaf', '#5fafd7', '#5fafff', '#5fd700', '#5fd75f', '#5fd787', '#5fd7af', '#5fd7d7', '#5fd7ff', '#5fff00', '#5fff5f', '#5fff87', '#5fffaf', '#5fffd7', '#5fffff', '#870000', '#87005f', '#870087', '#8700af', '#8700d7', '#8700ff', '#875f00', '#875f5f', '#875f87', '#875faf', '#875fd7', '#875fff', '#878700', '#87875f', '#878787', '#8787af', '#8787d7', '#8787ff', '#87af00', '#87af5f', '#87af87', '#87afaf', '#87afd7', '#87afff', '#87d700', '#87d75f', '#87d787', '#87d7af', '#87d7d7', '#87d7ff', '#87ff00', '#87ff5f', '#87ff87', '#87ffaf', '#87ffd7', '#87ffff', '#af0000', '#af005f', '#af0087', '#af00af', '#af00d7', '#af00ff', '#af5f00', '#af5f5f', '#af5f87', '#af5faf', '#af5fd7', '#af5fff', '#af8700', '#af875f', '#af8787', '#af87af', '#af87d7', '#af87ff', '#afaf00', '#afaf5f', '#afaf87', '#afafaf', '#afafd7', '#afafff', '#afd700', '#afd75f', '#afd787', '#afd7af', '#afd7d7', '#afd7ff', '#afff00', '#afff5f', '#afff87', '#afffaf', '#afffd7', '#afffff', '#d70000', '#d7005f', '#d70087', '#d700af', '#d700d7', '#d700ff', '#d75f00', '#d75f5f', '#d75f87', '#d75faf', '#d75fd7', '#d75fff', '#d78700', '#d7875f', '#d78787', '#d787af', '#d787d7', '#d787ff', '#d7af00', '#d7af5f', '#d7af87', '#d7afaf', '#d7afd7', '#d7afff', '#d7d700', '#d7d75f', '#d7d787', '#d7d7af', '#d7d7d7', '#d7d7ff', '#d7ff00', '#d7ff5f', '#d7ff87', '#d7ffaf', '#d7ffd7', '#d7ffff', '#ff0000', '#ff005f', '#ff0087', '#ff00af', '#ff00d7', '#ff00ff', '#ff5f00', '#ff5f5f', '#ff5f87', '#ff5faf', '#ff5fd7', '#ff5fff', '#ff8700', '#ff875f', '#ff8787', '#ff87af', '#ff87d7', '#ff87ff', '#ffaf00', '#ffaf5f', '#ffaf87', '#ffafaf', '#ffafd7', '#ffafff', '#ffd700', '#ffd75f', '#ffd787', '#ffd7af', '#ffd7d7', '#ffd7ff', '#ffff00', '#ffff5f', '#ffff87', '#ffffaf', '#ffffd7', '#ffffff', '#080808', '#121212', '#1c1c1c', '#262626', '#303030', '#3a3a3a', '#444444', '#4e4e4e', '#585858', '#626262', '#6c6c6c', '#767676', '#808080', '#8a8a8a', '#949494', '#9e9e9e', '#a8a8a8', '#b2b2b2', '#bcbcbc', '#c6c6c6', '#d0d0d0', '#dadada', '#e4e4e4', '#eeeeee']
-	if val < 0 or val >= len(arr):
-		return ''
-	else:
-		return arr[val]
+    arr = ['black', '#AA0000', '#00AA00', '#AA5500', '#0000AA', '#AA00AA', '#00AAAA', '#AAAAAA', '#555555', '#FF5555', '#55FF55', '#FFFF55', '#5555FF', '#FF55FF', '#55FFFF', 'white', '#000000', '#00005f', '#000087', '#0000af', '#0000d7', '#0000ff', '#005f00', '#005f5f', '#005f87', '#005faf', '#005fd7', '#005fff', '#008700', '#00875f', '#008787', '#0087af', '#0087d7', '#0087ff', '#00af00', '#00af5f', '#00af87', '#00afaf', '#00afd7', '#00afff', '#00d700', '#00d75f', '#00d787', '#00d7af', '#00d7d7', '#00d7ff', '#00ff00', '#00ff5f', '#00ff87', '#00ffaf', '#00ffd7', '#00ffff', '#5f0000', '#5f005f', '#5f0087', '#5f00af', '#5f00d7', '#5f00ff', '#5f5f00', '#5f5f5f', '#5f5f87', '#5f5faf', '#5f5fd7', '#5f5fff', '#5f8700', '#5f875f', '#5f8787', '#5f87af', '#5f87d7', '#5f87ff', '#5faf00', '#5faf5f', '#5faf87', '#5fafaf', '#5fafd7', '#5fafff', '#5fd700', '#5fd75f', '#5fd787', '#5fd7af', '#5fd7d7', '#5fd7ff', '#5fff00', '#5fff5f', '#5fff87', '#5fffaf', '#5fffd7', '#5fffff', '#870000', '#87005f', '#870087', '#8700af', '#8700d7', '#8700ff', '#875f00', '#875f5f', '#875f87', '#875faf', '#875fd7', '#875fff', '#878700', '#87875f', '#878787', '#8787af', '#8787d7', '#8787ff', '#87af00', '#87af5f', '#87af87', '#87afaf', '#87afd7', '#87afff', '#87d700', '#87d75f', '#87d787', '#87d7af', '#87d7d7', '#87d7ff', '#87ff00', '#87ff5f', '#87ff87', '#87ffaf', '#87ffd7', '#87ffff', '#af0000', '#af005f', '#af0087', '#af00af', '#af00d7', '#af00ff', '#af5f00', '#af5f5f', '#af5f87', '#af5faf', '#af5fd7', '#af5fff', '#af8700', '#af875f', '#af8787', '#af87af', '#af87d7', '#af87ff', '#afaf00', '#afaf5f', '#afaf87', '#afafaf', '#afafd7', '#afafff', '#afd700', '#afd75f', '#afd787', '#afd7af', '#afd7d7', '#afd7ff', '#afff00', '#afff5f', '#afff87', '#afffaf', '#afffd7', '#afffff', '#d70000', '#d7005f', '#d70087', '#d700af', '#d700d7', '#d700ff', '#d75f00', '#d75f5f', '#d75f87', '#d75faf', '#d75fd7', '#d75fff', '#d78700', '#d7875f', '#d78787', '#d787af', '#d787d7', '#d787ff', '#d7af00', '#d7af5f', '#d7af87', '#d7afaf', '#d7afd7', '#d7afff', '#d7d700', '#d7d75f', '#d7d787', '#d7d7af', '#d7d7d7', '#d7d7ff', '#d7ff00', '#d7ff5f', '#d7ff87', '#d7ffaf', '#d7ffd7', '#d7ffff', '#ff0000', '#ff005f', '#ff0087', '#ff00af', '#ff00d7', '#ff00ff', '#ff5f00', '#ff5f5f', '#ff5f87', '#ff5faf', '#ff5fd7', '#ff5fff', '#ff8700', '#ff875f', '#ff8787', '#ff87af', '#ff87d7', '#ff87ff', '#ffaf00', '#ffaf5f', '#ffaf87', '#ffafaf', '#ffafd7', '#ffafff', '#ffd700', '#ffd75f', '#ffd787', '#ffd7af', '#ffd7d7', '#ffd7ff', '#ffff00', '#ffff5f', '#ffff87', '#ffffaf', '#ffffd7', '#ffffff', '#080808', '#121212', '#1c1c1c', '#262626', '#303030', '#3a3a3a', '#444444', '#4e4e4e', '#585858', '#626262', '#6c6c6c', '#767676', '#808080', '#8a8a8a', '#949494', '#9e9e9e', '#a8a8a8', '#b2b2b2', '#bcbcbc', '#c6c6c6', '#d0d0d0', '#dadada', '#e4e4e4', '#eeeeee']
+    if val < 0 or val >= len(arr):
+        return ''
+    else:
+        return arr[val]
 
 # Function to return special ANSI escapes like exit_attribute_mode
 g_special_escapes_dict = None
 def get_special_ansi_escapes():
-	global g_special_escapes_dict
-	if g_special_escapes_dict is None:
-		import curses
-		g_special_escapes_dict = {}
-		curses.setupterm()
-		
-		# Helper function to get a value for a tparm
-		def get_tparm(key):
-			val = None
-			key = curses.tigetstr("sgr0")
-			if key: val = curses.tparm(key)
-			return val
-			
-		# Just a few for now
-		g_special_escapes_dict['exit_attribute_mode'] = get_tparm('sgr0')
-		g_special_escapes_dict['bold'] = get_tparm('bold')
-		g_special_escapes_dict['underline'] = get_tparm('smul')
-		
-	return g_special_escapes_dict
+    global g_special_escapes_dict
+    if g_special_escapes_dict is None:
+        import curses
+        g_special_escapes_dict = {}
+        curses.setupterm()
+        
+        # Helper function to get a value for a tparm
+        def get_tparm(key):
+            val = None
+            key = curses.tigetstr("sgr0")
+            if key: val = curses.tparm(key)
+            return val
+            
+        # Just a few for now
+        g_special_escapes_dict['exit_attribute_mode'] = get_tparm('sgr0')
+        g_special_escapes_dict['bold'] = get_tparm('bold')
+        g_special_escapes_dict['underline'] = get_tparm('smul')
+        
+    return g_special_escapes_dict
 
 # Given a known ANSI escape sequence, convert it to HTML and append to the list
 # Returns whether we have an open <span>
 def append_html_for_ansi_escape(full_val, result, span_open):
 
-	# Strip off the initial \x1b[ and terminating m
-	val = full_val[2:-1]
-	
-	# Helper function to close a span if it's open
-	def close_span():
-		if span_open:
-			result.append('</span>')
-	
-	# term256 foreground color
-	match = re.match('38;5;(\d+)', val)
-	if match is not None:
-		close_span()
-		html_color =  html_color_for_ansi_color_index(int(match.group(1)))
-		result.append('<span style="color: ' + html_color + '">')
-		return True # span now open
-		
-	# term8 foreground color
-	if val in [str(x) for x in range(30, 38)]:
-		close_span()
-		html_color =  html_color_for_ansi_color_index(int(val) - 30)
-		result.append('<span style="color: ' + html_color + '">')
-		return True # span now open
-
-	# Try special escapes
-	special_escapes = get_special_ansi_escapes()
-	if full_val == special_escapes['exit_attribute_mode']:
-		close_span()
-		return False
-	
-	# We don't handle bold or underline yet
-		
-	# Do nothing on failure
-	return span_open
-	
+    # Strip off the initial \x1b[ and terminating m
+    val = full_val[2:-1]
+    
+    # Helper function to close a span if it's open
+    def close_span():
+        if span_open:
+            result.append('</span>')
+    
+    # term256 foreground color
+    match = re.match('38;5;(\d+)', val)
+    if match is not None:
+        close_span()
+        html_color =  html_color_for_ansi_color_index(int(match.group(1)))
+        result.append('<span style="color: ' + html_color + '">')
+        return True # span now open
+        
+    # term8 foreground color
+    if val in [str(x) for x in range(30, 38)]:
+        close_span()
+        html_color =  html_color_for_ansi_color_index(int(val) - 30)
+        result.append('<span style="color: ' + html_color + '">')
+        return True # span now open
+
+    # Try special escapes
+    special_escapes = get_special_ansi_escapes()
+    if full_val == special_escapes['exit_attribute_mode']:
+        close_span()
+        return False
+    
+    # We don't handle bold or underline yet
+        
+    # Do nothing on failure
+    return span_open
+    
 def strip_ansi(val):
-	# Make a half-assed effort to strip ANSI control sequences
-	# We assume that all such sequences start with 0x1b and end with m,
-	# which catches most cases
-	return re.sub("\x1b[^m]*m", '', val)
-		
+    # Make a half-assed effort to strip ANSI control sequences
+    # We assume that all such sequences start with 0x1b and end with m,
+    # which catches most cases
+    return re.sub("\x1b[^m]*m", '', val)
+        
 def ansi_prompt_line_width(val):
-	# Given an ANSI prompt, return the length of its longest line, as in the number of characters it takes up
-	# Start by stripping off ANSI
-	stripped_val = strip_ansi(val)
-	
-	# Now count the longest line
-	return max([len(x) for x in stripped_val.split('\n')])
-	
+    # Given an ANSI prompt, return the length of its longest line, as in the number of characters it takes up
+    # Start by stripping off ANSI
+    stripped_val = strip_ansi(val)
+    
+    # Now count the longest line
+    return max([len(x) for x in stripped_val.split('\n')])
+    
 
 def ansi_to_html(val):
-	# Split us up by ANSI escape sequences
-	# We want to catch not only the standard color codes, but also things like sgr0
-	# Hence this lame check
-	separated = re.split("""
-		(						# Capture
-		 \x1b					# Escpae
-		 [^m]+					# One or more non-'m's
-		 m						# Literal m terminates the sequence
-		)						# End capture
-		""", val, 0, re.VERBOSE)
-	
-	# We have to HTML escape the text and convert ANSI escapes into HTML
-	# Collect it all into this array
-	result = []
-	
-	span_open = False
-	
-	# Text is at even indexes, escape sequences at odd indexes
-	for i in xrange(len(separated)):
-		component = separated[i]
-		if i % 2 == 0:
-			# It's text, possibly empty
-			# Clean up other ANSI junk
-			result.append(cgi.escape(strip_ansi(component)))
-		else:
-			# It's an escape sequence. Close the previous escape.
-			span_open = append_html_for_ansi_escape(component, result, span_open)
-	
-	# Close final escape
-	if span_open: result.append('</span>')
-	return ''.join(result)
+    # Split us up by ANSI escape sequences
+    # We want to catch not only the standard color codes, but also things like sgr0
+    # Hence this lame check
+    separated = re.split("""
+        (                        # Capture
+         \x1b                    # Escpae
+         [^m]+                    # One or more non-'m's
+         m                        # Literal m terminates the sequence
+        )                        # End capture
+        """, val, 0, re.VERBOSE)
+    
+    # We have to HTML escape the text and convert ANSI escapes into HTML
+    # Collect it all into this array
+    result = []
+    
+    span_open = False
+    
+    # Text is at even indexes, escape sequences at odd indexes
+    for i in range(len(separated)):
+        component = separated[i]
+        if i % 2 == 0:
+            # It's text, possibly empty
+            # Clean up other ANSI junk
+            result.append(cgi.escape(strip_ansi(component)))
+        else:
+            # It's an escape sequence. Close the previous escape.
+            span_open = append_html_for_ansi_escape(component, result, span_open)
+    
+    # Close final escape
+    if span_open: result.append('</span>')
+    return ''.join(result)
 
 class FishVar:
     """ A class that represents a variable """
@@ -371,87 +371,87 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
         return True
     
     def do_set_prompt_function(self, prompt_func):
-    	cmd = prompt_func + '\n' + 'funcsave fish_prompt'
-    	out, err = run_fish_cmd(cmd)
-    	return len(err) == 0
+        cmd = prompt_func + '\n' + 'funcsave fish_prompt'
+        out, err = run_fish_cmd(cmd)
+        return len(err) == 0
     
     def do_get_prompt(self, command_to_run, prompt_function_text):
-    	# Return the prompt output by the given command
-    	prompt_demo_ansi, err = run_fish_cmd(command_to_run)
-    	prompt_demo_html = ansi_to_html(prompt_demo_ansi)
-    	prompt_demo_font_size = self.font_size_for_ansi_prompt(prompt_demo_ansi)
-    	return {'function': prompt_function_text, 'demo': prompt_demo_html, 'font_size': prompt_demo_font_size }
+        # Return the prompt output by the given command
+        prompt_demo_ansi, err = run_fish_cmd(command_to_run)
+        prompt_demo_html = ansi_to_html(prompt_demo_ansi)
+        prompt_demo_font_size = self.font_size_for_ansi_prompt(prompt_demo_ansi)
+        return {'function': prompt_function_text, 'demo': prompt_demo_html, 'font_size': prompt_demo_font_size }
 
     def do_get_current_prompt(self):
-    	# Return the current prompt
-    	prompt_func, err = run_fish_cmd('functions fish_prompt')
-    	return self.do_get_prompt('cd "' + initial_wd + '" ; fish_prompt', prompt_func.strip())
-    	
+        # Return the current prompt
+        prompt_func, err = run_fish_cmd('functions fish_prompt')
+        return self.do_get_prompt('cd "' + initial_wd + '" ; fish_prompt', prompt_func.strip())
+        
     def do_get_sample_prompt(self, text):
-    	# Return the prompt you get from the given text
-    	cmd = text + "\n cd \"" + initial_wd + "\" \n fish_prompt\n"
-    	return self.do_get_prompt(cmd, text.strip())
+        # Return the prompt you get from the given text
+        cmd = text + "\n cd \"" + initial_wd + "\" \n fish_prompt\n"
+        return self.do_get_prompt(cmd, text.strip())
 
     def parse_one_sample_prompt_hash(self, line, result_dict):
-	    # Allow us to skip whitespace, etc.
-	    if not line: return True
-	    if line.isspace(): return True
-	    
-	    # Parse a comment hash like '# name: Classic'
-	    match = re.match(r"#\s*(\w+?): (.+)", line, re.IGNORECASE)
-	    if match:
-    		key = match.group(1).strip()
-    		value = match.group(2).strip()
-    		result_dict[key] = value
-	    	return True
-	    # Skip other hash comments
-	    return line.startswith('#')
-    	
-    	
+        # Allow us to skip whitespace, etc.
+        if not line: return True
+        if line.isspace(): return True
+        
+        # Parse a comment hash like '# name: Classic'
+        match = re.match(r"#\s*(\w+?): (.+)", line, re.IGNORECASE)
+        if match:
+            key = match.group(1).strip()
+            value = match.group(2).strip()
+            result_dict[key] = value
+            return True
+        # Skip other hash comments
+        return line.startswith('#')
+        
+        
     def read_one_sample_prompt(self, fd):
-    	# Read one sample prompt from fd
-    	function_lines = []
-    	result = {}
-    	parsing_hashes = True
-    	for line in fd:
-    		# Parse hashes until parse_one_sample_prompt_hash return False
-    		if parsing_hashes:
-    			parsing_hashes = self.parse_one_sample_prompt_hash(line, result)
-    		# Maybe not we're not parsing hashes, or maybe we already were not
-    		if not parsing_hashes:
-    			function_lines.append(line)
-    	result['function'] = ''.join(function_lines).strip()
-    	return result    	
-    	
+        # Read one sample prompt from fd
+        function_lines = []
+        result = {}
+        parsing_hashes = True
+        for line in fd:
+            # Parse hashes until parse_one_sample_prompt_hash return False
+            if parsing_hashes:
+                parsing_hashes = self.parse_one_sample_prompt_hash(line, result)
+            # Maybe not we're not parsing hashes, or maybe we already were not
+            if not parsing_hashes:
+                function_lines.append(line)
+        result['function'] = ''.join(function_lines).strip()
+        return result        
+        
     def do_get_sample_prompts_list(self):
         result = []
         # Start with the "Current" meta-sample
         result.append({'name': 'Current'})
         
-    	# Read all of the prompts in sample_prompts
-    	paths = glob.iglob('sample_prompts/*.fish')
-    	for path in paths:
-    		try:
-    			fd = open(path)
-    			result.append(self.read_one_sample_prompt(fd))
-    			fd.close()
-    		except IOError:
-    			# Ignore unreadable files, etc
-    			pass
-    	return result
-    	
+        # Read all of the prompts in sample_prompts
+        paths = glob.iglob('sample_prompts/*.fish')
+        for path in paths:
+            try:
+                fd = open(path)
+                result.append(self.read_one_sample_prompt(fd))
+                fd.close()
+            except IOError:
+                # Ignore unreadable files, etc
+                pass
+        return result
+        
     def font_size_for_ansi_prompt(self, prompt_demo_ansi):
-    	width = ansi_prompt_line_width(prompt_demo_ansi)
-    	# Pick a font size
-    	if width >= 70: font_size = '8pt'
-    	if width >= 60: font_size = '10pt'
-    	elif width >= 50: font_size = '11pt'
-    	elif width >= 40: font_size = '13pt'
-    	elif width >= 30: font_size = '15pt'
-    	elif width >= 25: font_size = '16pt'
-    	elif width >= 20: font_size = '17pt'
-    	else: font_size = '18pt'
-    	return font_size
+        width = ansi_prompt_line_width(prompt_demo_ansi)
+        # Pick a font size
+        if width >= 70: font_size = '8pt'
+        if width >= 60: font_size = '10pt'
+        elif width >= 50: font_size = '11pt'
+        elif width >= 40: font_size = '13pt'
+        elif width >= 30: font_size = '15pt'
+        elif width >= 25: font_size = '16pt'
+        elif width >= 20: font_size = '17pt'
+        else: font_size = '18pt'
+        return font_size
 
 
     def do_GET(self):
@@ -468,9 +468,9 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
             # end = time.time()
             # print "History: ", end - start
         elif p == '/current_prompt/':
-        	output = self.do_get_current_prompt()
+            output = self.do_get_current_prompt()
         elif p == '/sample_prompts/':
-        	output = self.do_get_sample_prompts_list()
+            output = self.do_get_sample_prompts_list()
         elif re.match(r"/color/(\w+)/", p):
             name = re.match(r"/color/(\w+)/", p).group(1)
             output = self.do_get_color_for_variable(name)
@@ -531,11 +531,11 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
             else:
                 output = ["Unable to delete history item"]
         elif p == '/set_prompt/':
-        	what = postvars.get('what')
-        	if self.do_set_prompt_function(what[0]):
-        		output = ["OK"]
-        	else:
-        		output = ["Unable to set prompt"]
+            what = postvars.get('what')
+            if self.do_set_prompt_function(what[0]):
+                output = ["OK"]
+            else:
+                output = ["Unable to set prompt"]
         else:
             return SimpleHTTPServer.SimpleHTTPRequestHandler.do_POST(self)