Rev 1019: Fix authentication for pyrex. in file:///data/jelmer/bzr-svn/pyrex/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/pyrex/

------------------------------------------------------------
revno: 1019
revision-id: jelmer at samba.org-20080321123725-rcq2u0nb2b06c8p7
parent: jelmer at samba.org-20080321040825-hicn3boefkr70xrb
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pyrex
timestamp: Fri 2008-03-21 13:37:25 +0100
message:
  Fix authentication for pyrex.
modified:
  auth.py                        auth.py-20071209174622-w8d42k6nm5yhxvi8-1
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
=== modified file 'auth.py'
--- a/auth.py	2008-03-18 23:27:43 +0000
+++ b/auth.py	2008-03-21 12:37:25 +0000
@@ -24,9 +24,10 @@
                 get_simple_provider, get_username_provider, 
                 get_ssl_client_cert_file_provider, 
                 get_ssl_client_cert_pw_file_provider,
-                get_ssl_server_trust_file_provider
+                get_ssl_server_trust_file_provider,
+                Auth
                 )
-from ra import Auth
+import ra
 import constants
 
 class SubversionAuthenticationConfig(AuthenticationConfig):
@@ -148,14 +149,14 @@
         get_ssl_server_trust_file_provider(),
         ]
 
-    if hasattr(core, 'get_windows_simple_provider'):
-        providers.append(core.get_windows_simple_provider())
-
-    if hasattr(core, 'get_keychain_simple_provider'):
-        providers.append(core.get_keychain_simple_provider())
-
-    if hasattr(core, 'get_windows_ssl_server_trust_provider'):
-        providers.append(core.get_windows_ssl_server_trust_provider())
+    if hasattr(ra, 'get_windows_simple_provider'):
+        providers.append(ra.get_windows_simple_provider())
+
+    if hasattr(ra, 'get_keychain_simple_provider'):
+        providers.append(ra.get_keychain_simple_provider())
+
+    if hasattr(ra, 'get_windows_ssl_server_trust_provider'):
+        providers.append(ra.get_windows_ssl_server_trust_provider())
 
     return Auth(providers)
 

=== modified file 'transport.py'
--- a/transport.py	2008-03-18 23:27:43 +0000
+++ b/transport.py	2008-03-21 12:37:25 +0000
@@ -83,9 +83,9 @@
 
         try:
             self.mutter('opening SVN RA connection to %r' % self._backing_url)
-            self._ra = ra.RemoteAccess(self._backing_url.encode('utf8'))
+            self._ra = ra.RemoteAccess(self._backing_url.encode('utf8'), 
+                    auth=create_auth_baton())
             # FIXME: Callbacks
-            # FIXME: self._ra = create_auth_baton()
         except SubversionException, (_, num):
             if num in (constants.ERR_RA_SVN_REPOS_NOT_FOUND,):
                 raise NoSvnRepositoryPresent(url=url)