Merge lp:~javier.collado/utah/bug1156554 into lp:utah

[Javier Collado]

This branch workarounds and import error problem by setting a hardcoded default
value when the import error happens, that is, when the config module uses the
url_argument function.

I don't like capturing ImportError exceptions, but this is the best I think I
can do to make it possible to use a function in the config module that requires
a default value from the configuration module itself.

If you have some ideas to improve the situation, please let me know.

[Max Brustkern (nuclearbob)]

On line 23, change ImporError to ImportError and I think we're good. I'd like to try to merge this and get testing started for a new stable version today, so if you don't make this change before EOD, I'll make it when I merge.

review: Approve

[lp:~javier.collado/utah/bug1156554]

836. By Javier Collado on 2013-03-18

Fixed typo

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-01 14:18:10 +0000
+++ debian/changelog	2013-03-18 15:34:21 +0000
@@ -9,6 +9,7 @@
   * Clarified return code values in server and client
     (LP: #1025633, LP: #1133227)
   * Added reboot support (LP: #1086450)
+  * Fixed circular import when UTAH_CONFIG_FILE is set (LP: #1156554)
 
   [ Max Brustkern ]
   * Fixed ProvisionedMachine template support (LP: #1147306)

=== modified file 'utah/retry.py'
--- utah/retry.py	2013-03-13 16:52:34 +0000
+++ utah/retry.py	2013-03-18 15:34:21 +0000
@@ -49,12 +49,20 @@
     .. seealso:: :func:`utah.timeout.timeout`
 
     """
-    # The following import is in the function body to avoid a cycle:
+    logmethod = kw.pop('logmethod', sys.stderr.write)
+
+    # The following import might cause an ImportError when url_argument is used
+    # in the config module. To avoid that, a hardcoded default value is used
+    # for those cases in which the config module hasn't yet been imported.
+    # The cycle is as follows:
     # utah.config -> utah.url -> utah.retry -> utah.config
-    from utah import config
+    try:
+        from utah import config
+        retry_timeout = config.retry_timeout
+    except ImportError:
+        retry_timeout = 3
 
-    logmethod = kw.pop('logmethod', sys.stderr.write)
-    retry_timeout = kw.pop('retry_timeout', config.retry_timeout)
+    retry_timeout = kw.pop('retry_timeout', retry_timeout)
     retval = False
     while True:
         try: