Merged -- no conflict

theano/gof/cmodule.py

@@ -760,6 +760,9 @@ class ModuleCache(object):
             compilelock.get_lock()
             # This try/finally block ensures that the lock is released once we
             # are done writing in the cache file or after raising an exception.
+            try:
+                # Embedding two try statements for Python 2.4 compatibility
+                # (cannot do try / except / finally).
                 try:
                     location = dlimport_workdir(self.dirname)
                 except OSError, e:
@@ -768,10 +771,6 @@ class ModuleCache(object):
                         error('There are', len(os.listdir(config.compiledir)),
                                 'files in', config.compiledir)
                     raise
-
-            try:
-                # Embedding two try statements for Python 2.4 compatibility
-                # (cannot do try / except / finally).
                 try:
                     compile_steps = fn(location=location).__iter__()