Merge branch 'netrc-integration'

[offlineimap] / offlineimap / repository / IMAP.py

diff --git a/offlineimap/repository/IMAP.py b/offlineimap/repository/IMAP.py
index 388535859c00084d8aeef04317e1e07cc378abf2..85870406853ebffc7505291f1baf4d088296c300 100644 (file)
--- a/offlineimap/repository/IMAP.py
+++ b/offlineimap/repository/IMAP.py
@@ -20,7 +20,7 @@ from Base import BaseRepository
 from offlineimap import folder, imaputil, imapserver
 from offlineimap.folder.UIDMaps import MappedIMAPFolder
 from offlineimap.threadutil import ExitNotifyThread
 from offlineimap import folder, imaputil, imapserver
 from offlineimap.folder.UIDMaps import MappedIMAPFolder
 from offlineimap.threadutil import ExitNotifyThread

-import re, types, os
+import re, types, os, netrc, errno

 from threading import *
 
 class IMAPRepository(BaseRepository):
 from threading import *
 
 class IMAPRepository(BaseRepository):


@@ -110,6 +110,15 @@ class IMAPRepository(BaseRepository):
         if user != None:
             return user
 
         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)
 
     def getport(self):
         return self.getconfint('remoteport', None)
 


@@ -146,6 +155,17 @@ class IMAPRepository(BaseRepository):
             password = fd.readline().strip()
             fd.close()
             return password
             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):
         return None
 
     def getfolder(self, foldername):