Checking in changes to support regions in EC2.

1 files changed, 8 insertions, 8 deletions

diff --git a/boto/ec2/address.py b/boto/ec2/address.py
index eec06e71..b2af1075 100644
--- a/boto/ec2/address.py
+++ b/boto/ec2/address.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2006,2007 Mitch Garnaat http://garnaat.org/
+# Copyright (c) 2006-2008 Mitch Garnaat http://garnaat.org/
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -23,19 +23,19 @@
 Represents an EC2 Elastic IP Address
 """
 
-class Address:
+from boto.ec2.ec2object import EC2Object
+
+class Address(EC2Object):
     
-    def __init__(self, connection=None):
+    def __init__(self, connection=None, public_ip=None, instance_id=None):
+        EC2Object.__init__(self, connection)
         self.connection = connection
-        self.public_ip = None
-        self.instance_id = None
+        self.public_ip = public_ip
+        self.instance_id = instance_id
 
     def __repr__(self):
         return 'Address:%s' % self.public_ip
 
-    def startElement(self, name, attrs, connection):
-        return None
-
     def endElement(self, name, value, connection):
         if name == 'publicIp':
             self.public_ip = value