Merge pull request #18 from ihrke/master

Replace {code} blocks in path string

ipycache.py

@@ -8,7 +8,7 @@
 #------------------------------------------------------------------------------
 
 # Stdlib
-import inspect, os, sys, textwrap, cPickle
+import inspect, os, sys, textwrap, cPickle, re
 
 # Our own
 from IPython.config.configurable import Configurable
@@ -54,10 +54,18 @@ def iteritems(d, **kw):
 # Functions
 #------------------------------------------------------------------------------
 def conditional_eval(var, variables):
-    """ Evaluates the variable string if it starts with $. """
+    """
+    Evaluates the variable string if it starts with $.
+    If the variable string contains one or several {code} statements, the code
+    is executed and the result stringified (wrapped in str()) into the rest of
+    the string.
+    """
     if var[0] == '$':
         return variables.get(var[1:], var)
-    return var
+    def evalfun(x):
+        code=x.group(0)[1:-1]
+        return str(eval(code, variables))
+    return re.sub(r'{.*?}', evalfun, var, flags=re.DOTALL)
 
 def clean_var(var):
     """Clean variable name, removing accidental commas, etc."""

setup.py

@@ -20,7 +20,7 @@ def read(fname):
     keywords="ipython notebook cache",
     url="http://packages.python.org/ipycache",
     py_modules=['ipycache'],
-    long_description=read('README'),
+    long_description=read('README.md'),
     classifiers=[
         "Development Status :: 3 - Alpha",
         "Topic :: Utilities",

test_ipycache.py

@@ -19,7 +19,11 @@
 def test_conditional_eval():
     test_var = 'abc'
     assert conditional_eval('$test_var', locals()) == 'abc'
-
+    x,fun=10,lambda x: x
+    test_eval='abc_{"10" if x==10 else "not_10"}_{fun(10)}'
+    expect='abc_10_10'
+    assert conditional_eval(test_eval, locals())==expect
+
 def test_clean_var():
     assert clean_var('abc') == 'abc'
     assert clean_var('abc ') == 'abc'