Merge pull request #2786 from nouiz/cache

doc/tutorial/python.txt

@@ -10,7 +10,7 @@ tutorials/exercises if you need to learn it or only need a refresher:
 
   * `Python Challenge <http://www.pythonchallenge.com/>`__
   * `Dive into Python <http://diveintopython.net/>`__
-  * `Google Python Class <http://code.google.com/edu/languages/google-python-class/index.html>`__
+  * `Google Python Class <https://developers.google.com/edu/python/>`__
   * `Enthought Python course <https://training.enthought.com/?utm_source=academic&utm_medium=email&utm_campaign=EToD-Launch#/courses>`__ (free for academics)
 
 We have a tutorial on how :ref:`Python manages its memory <python-memory-management>`.

theano/gof/cmodule.py

@@ -1121,7 +1121,9 @@ class ModuleCache(object):
                 # same time.  This can happen as we read the cache
                 # without taking the lock.
                 if i == 2:
-                    raise
+                    with compilelock.lock_ctx():
+                        with open(key_pkl, 'rb') as f:
+                            key_data = cPickle.load(f)
                 time.sleep(2)
 
         found = sum(key == other_key for other_key in key_data.keys)