Bugfixing

Author: mnielsen

ec2.py

@@ -21,7 +21,10 @@
 from boto.ec2.connection import EC2Connection
 
 # My libraries
-import ec2_classes
+try:
+    import ec2.ec2_classes as ec2_classes
+except ImportError:
+    import ec2_classes
 
 #### Constants and globals
 

ec2_classes.py

@@ -2,12 +2,18 @@
 ec2_classes.py
 ~~~~~~~~~~~~~~
 
-Defines the Cluster and Instance classes used by `ec2.py`.  These
-classes are put in a separate module because `ec2.py` stores instances
-of these classes by pickling (through shelves), and ...
-
+Defines the Cluster and Instance classes used by `ec2.py`.  
 """
 
+# Why are these classes stored in a separate module from ec2.py?
+#
+# These classes are put in a separate module because ec2.py stores
+# instances of these classes by pickling (through shelves).  Pickling
+# classes defined within ec2.py creates namespace problems that can be
+# solved by putting the class definitions into a separate module. See:
+#
+# http://stackoverflow.com/questions/3614379/attributeerror-when-unpickling-an-object
+
 #### Cluster and Instance classes
 
 class Cluster():