[kupfer: 4/18] calculator: separate action for expression with and w/o =

[Ulrik Sverdrup <usverdrup src gnome org>]

commit 2ab3b502611b7a8fe6b096218b20e50c91f1c524
Author: Karol BÄdkowski <karol bedkowski gmail com>
Date:   Sun Jun 10 13:30:23 2012 +0200

    calculator: separate action for expression with and w/o =
    
    Expression that not start with = should have lower rank. This prevent
    setting calculate action for i.e. url.

 kupfer/plugin/calculator.py |   42 +++++++++++++++++++++++++++++++-----------
 1 files changed, 31 insertions(+), 11 deletions(-)
---
diff --git a/kupfer/plugin/calculator.py b/kupfer/plugin/calculator.py
index 3de7e22..c79260a 100644
--- a/kupfer/plugin/calculator.py
+++ b/kupfer/plugin/calculator.py
@@ -1,10 +1,17 @@
 from __future__ import division
 __kupfer_name__ = _("Calculator")
-__kupfer_actions__ = ("Calculate", )
+__kupfer_actions__ = ("Calculate", "CalculateOtherExpressions")
 __description__ = _("Calculate mathematical expressions")
-__version__ = "2012-06-09"
+__version__ = "2012-06-10"
 __author__ = "Ulrik Sverdrup <ulrik sverdrup gmail com>"
 
+"""
+Changes:
+	2012-06-09:
+		+ calculate action for expression w/o =
+	2012-06-10:
+		+ separate Calculate action
+"""
 
 import cmath
 import math
@@ -67,7 +74,7 @@ class Help (object):
 				continue
 			wrapped_lines = textwrap.wrap(docsplit[1].strip(),
 					maxlen - left_margin)
-			wrapped = (u"\n" + u" "*left_margin).join(wrapped_lines)
+			wrapped = (u"\n" + u" " * left_margin).join(wrapped_lines)
 			formatted.append("%s\n    %s" % (docsplit[0], wrapped))
 		uiutils.show_text_result("\n\n".join(formatted), _("Calculator"))
 		raise IgnoreResultException
@@ -103,26 +110,29 @@ def format_result(res):
 class Calculate (Action):
 	# since it applies only to special queries, we can up the rank
 	rank_adjust = 10
+	# global last_result
+	last_result = {'last': None}
+
 	def __init__(self):
 		Action.__init__(self, _("Calculate"))
-		self.last_result = None
 
 	def has_result(self):
 		return True
+
 	def activate(self, leaf):
 		expr = leaf.object.lstrip("= ")
 
 		# try to add missing parantheses
 		brackets_missing = expr.count("(") - expr.count(")")
 		if brackets_missing > 0:
-			expr += ")"*brackets_missing
-		environment = make_environment(self.last_result)
+			expr += ")" * brackets_missing
+		environment = make_environment(self.last_result['last'])
 
 		pretty.print_debug(__name__, "Evaluating", repr(expr))
 		try:
 			result = eval(expr, environment)
 			resultstr = format_result(result)
-			self.last_result = result
+			self.last_result['last'] = result
 		except IgnoreResultException:
 			return
 		except Exception, exc:
@@ -132,9 +142,22 @@ class Calculate (Action):
 
 	def item_types(self):
 		yield TextLeaf
+
+	def valid_for_item(self, leaf):
+		text = leaf.object
+		return text and text.startswith("=")
+
+	def get_description(self):
+		return None
+
+
+class CalculateOtherExpressions(Calculate):
+	""" Calcualte expressions that not starts with "=" """
+	rank_adjust = 0
+
 	def valid_for_item(self, leaf):
 		text = leaf.object
-		return text and (text.startswith("=") or
+		return text and not text.startswith("=") and (
 				"+" in text or
 				"-" in text or
 				"*" in text or
@@ -143,6 +166,3 @@ class Calculate (Action):
 				"&" in text or
 				"|" in text or
 				"~" in text)
-
-	def get_description(self):
-		return None