Skip to content
Browse files

Merge remote-tracking branch 'upstream/develop' into develop

  • Loading branch information...
2 parents e67a1b7 + 9a18660 commit eca116919192647a0271cc08c2e0db91ce963254 @gertjanol gertjanol committed Oct 15, 2012
Showing with 10 additions and 2 deletions.
  1. +1 −1 boto/rds/__init__.py
  2. +2 −0 boto/route53/record.py
  3. +7 −1 setup.py
View
2 boto/rds/__init__.py
@@ -80,7 +80,7 @@ def connect_to_region(region_name, **kw_params):
class RDSConnection(AWSQueryConnection):
DefaultRegionName = 'us-east-1'
- DefaultRegionEndpoint = 'rds.us-east-1.amazonaws.com'
+ DefaultRegionEndpoint = 'rds.amazonaws.com'
APIVersion = '2012-09-17'
def __init__(self, aws_access_key_id=None, aws_secret_access_key=None,
View
2 boto/route53/record.py
@@ -264,6 +264,8 @@ def to_print(self):
if self.identifier != None and self.weight != None:
rr += ' (WRR id=%s, w=%s)' % (self.identifier, self.weight)
+ elif self.identifier != None and self.region != None:
+ rr += ' (LBR id=%s, region=%s)' % (self.identifier, self.region)
return rr
View
8 setup.py
@@ -23,6 +23,8 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
+from __future__ import with_statement
+
try:
from setuptools import setup
extra = dict(test_suite="tests.test.suite", include_package_data=True)
@@ -39,10 +41,14 @@
print >> sys.stderr, error
sys.exit(1)
+def readme():
+ with open("README.rst") as f:
+ return f.read()
+
setup(name = "boto",
version = __version__,
description = "Amazon Web Services Library",
- long_description = open("README.rst").read(),
+ long_description = readme(),
author = "Mitch Garnaat",
author_email = "mitch@garnaat.com",
scripts = ["bin/sdbadmin", "bin/elbadmin", "bin/cfadmin",

0 comments on commit eca1169

Please sign in to comment.
Something went wrong with that request. Please try again.