Merge branch 'netrc-integration'

[offlineimap] / offlineimap / repository / IMAP.py

diff --git a/offlineimap/repository/IMAP.py b/offlineimap/repository/IMAP.py
index bed03587960eda24601e633b55af3df33abf4b7d..85870406853ebffc7505291f1baf4d088296c300 100644 (file)
--- a/offlineimap/repository/IMAP.py
+++ b/offlineimap/repository/IMAP.py
@@ -109,6 +109,7 @@ class IMAPRepository(BaseRepository):
         user = self.getconf('remoteuser')
         if user != None:
             return user
+
         try:
             netrcentry = netrc.netrc().authentificator(self.gethost())
         except IOError, inst:
@@ -154,6 +155,7 @@ class IMAPRepository(BaseRepository):
             password = fd.readline().strip()
             fd.close()
             return password
+
         try:
             netrcentry = netrc.netrc().authenticators(self.gethost())
         except IOError, inst:
@@ -174,6 +176,13 @@ class IMAPRepository(BaseRepository):
     def getfoldertype(self):
         return folder.IMAP.IMAPFolder
 
+    def connect(self):
+        imapobj = self.imapserver.acquireconnection()
+        self.imapserver.releaseconnection(imapobj)
+
+    def forgetfolders(self):
+        self.folders = None
+
     def getfolders(self):
         if self.folders != None:
             return self.folders