Use generic connect function

This points all the existing `connect_to_region` functions to the
generic `connect` function within regioninfo.

1 files changed, 11 insertions, 4 deletions

diff --git a/boto/iam/__init__.py b/boto/iam/__init__.py
index 3df44f29..cd45d7ad 100644
--- a/boto/iam/__init__.py
+++ b/boto/iam/__init__.py
@@ -24,6 +24,7 @@
 # originally, the IAMConnection class was defined here
 from boto.iam.connection import IAMConnection
 from boto.regioninfo import RegionInfo, get_regions
+from boto.regioninfo import connect
 
 
 class IAMRegionInfo(RegionInfo):
@@ -80,7 +81,13 @@ def connect_to_region(region_name, **kw_params):
     :return: A connection to the given region, or None if an invalid region
              name is given
     """
-    for region in regions():
-        if region.name == region_name:
-            return region.connect(**kw_params)
-    return None
+    if region_name == 'universal':
+        region = IAMRegionInfo(
+            name='universal',
+            endpoint='iam.amazonaws.com',
+            connection_cls=IAMConnection
+        )
+        return region.connect(**kw_params)
+
+    return connect('iam', region_name, region_cls=IAMRegionInfo,
+                   connection_cls=IAMConnection, **kw_params)