Remove $external from the public API PYTHON-465

Author: behackett

pymongo/database.py

@@ -34,13 +34,10 @@ def _check_name(name):
  if not name:
  raise InvalidName("database name cannot be the empty string")
 
- # '$' is an illegal character in database names but $external
- # is required for GSSAPI authentication.
- if name != '$external':
- for invalid_char in [" ", ".", "$", "/", "\\", "\x00"]:
- if invalid_char in name:
- raise InvalidName("database names cannot contain the "
- "character %r" % invalid_char)
+ for invalid_char in [" ", ".", "$", "/", "\\", "\x00"]:
+ if invalid_char in name:
+ raise InvalidName("database names cannot contain the "
+ "character %r" % invalid_char)
 
 
 class Database(common.BaseObject):

pymongo/mongo_client.py

@@ -280,8 +280,11 @@ def __init__(self, host=None, port=None, max_pool_size=10,
  source = '$external'
  else:
  source = db_name or 'admin'
- if not self[source].authenticate(username,
- password, source, mechanism):
+ credentials = (source, unicode(username),
+ unicode(password), mechanism)
+ try:
+ self._cache_credentials(source, credentials)
+ except OperationFailure:
  raise ConfigurationError("authentication failed")
 
  def _cached(self, dbname, coll, index):

pymongo/mongo_replica_set_client.py

@@ -470,11 +470,13 @@ def __init__(self, hosts_or_uri=None, max_pool_size=10,
  source = '$external'
  else:
  source = db_name or 'admin'
- if not self[source].authenticate(username,
- password, source, mechanism):
+ credentials = (source, unicode(username),
+ unicode(password), mechanism)
+ try:
+ self._cache_credentials(source, credentials)
+ except OperationFailure:
  raise ConfigurationError("authentication failed")
 
-
  # Start the monitor after we know the configuration is correct.
  if monitor_class:
  self.__monitor = monitor_class(self)