From: John Goerzen <jgoerzen@complete.org>
Date: Mon, 3 Mar 2008 08:27:13 +0000 (-0600)
Subject: Merge branch 'netrc-integration'
X-Git-Tag: debian/5.99.5~7
X-Git-Url: https://code.delx.au/offlineimap/commitdiff_plain/7b4e651d1282a50a20614074f731dd22f3ec642f

Merge branch 'netrc-integration'

Applies patches by bboisin to add netrc support

Conflicts:

	offlineimap/repository/IMAP.py

refs #14
---

7b4e651d1282a50a20614074f731dd22f3ec642f
diff --cc offlineimap/repository/IMAP.py
index 3885358,bed0358..8587040
--- a/offlineimap/repository/IMAP.py
+++ b/offlineimap/repository/IMAP.py
@@@ -109,7 -109,15 +109,16 @@@ class IMAPRepository(BaseRepository)
          user = self.getconf('remoteuser')
          if user != None:
              return user
 +
+         try:
+             netrcentry = netrc.netrc().authentificator(self.gethost())
+         except IOError, inst:
+             if inst.errno != errno.ENOENT:
+                 raise
+         else:
+             if netrcentry:
+                 return netrcentry[0]
+ 
      def getport(self):
          return self.getconfint('remoteport', None)
  
@@@ -146,6 -154,16 +155,17 @@@
              password = fd.readline().strip()
              fd.close()
              return password
++
+         try:
+             netrcentry = netrc.netrc().authenticators(self.gethost())
+         except IOError, inst:
+             if inst.errno != errno.ENOENT:
+                 raise
+         else:
+             if netrcentry:
+                 user = self.getconf('remoteuser')
+                 if user == None or user == netrcentry[0]:
+                     return netrcentry[2]
          return None
  
      def getfolder(self, foldername):