boto/sdb/db/manager/__init__.py - Issue 8386013: Merging in latest boto.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: boto/sdb/db/manager/init.py

Issue 8386013: Merging in latest boto. (Closed) Base URL: svn://svn.chromium.org/boto

Patch Set: Redoing vendor drop by deleting and then merging. Created 9 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: boto/sdb/db/manager/__init__.py

diff --git a/boto/sdb/db/manager/__init__.py b/boto/sdb/db/manager/__init__.py

index 07777966007fce3165d13f43b99d513171864e6c..55b32a4dca21bdfb698a2c26310e723b4c2b467c 100644

--- a/boto/sdb/db/manager/__init__.py

+++ b/boto/sdb/db/manager/__init__.py

@@ -66,6 +66,9 @@ def get_manager(cls):

db_port = boto.config.getint(db_section, 'db_port', db_port)

enable_ssl = boto.config.getint(db_section, 'enable_ssl', enable_ssl)

debug = boto.config.getint(db_section, 'debug', debug)

+ elif hasattr(cls, "_db_name") and cls._db_name is not None:

+ # More specific then the generic DB config is any _db_name class property

+ db_name = cls._db_name

elif hasattr(cls.__bases__[0], "_manager"):

return cls.__bases__[0]._manager

if db_type == 'SimpleDB':

« no previous file with comments | « boto/sdb/db/blob.py ('k') | boto/sdb/db/manager/pgmanager.py » ('j') | no next file with comments »