Update BACKERS.md

Add logo (in feature branch of website, pending merge) with link to sponsor website!

BACKERS.md

@@ -0,0 +1,24 @@
+### Many thanks to our wonderful Sponsors!  Your generous support helps us maintain OfflineIMAP.
+
+
+<!-- PLATINUM sponsors: in the README.md and on the front page of website -->
+<!-- https://shields.io/opencollective/tier/offlineimap-organization/12940 -->
+
+<!-- GOLD sponsors: in the README.md and on the front page of website -->
+<!-- https://shields.io/opencollective/tier/offlineimap-organization/12941 -->
+
+# SILVER sponsors  <!-- here and on sponsors page of website -->
+<!-- https://shields.io/opencollective/tier/offlineimap-organization/12942 -->
+[![silver-zeronet-logo]][silver-zeronet-link]
+
+![Silver Sponsors][silver]
+
+# BRONZE sponsors <!-- here only -->
+<!-- https://shields.io/opencollective/tier/offlineimap-organization/12873 -->
+![Bronze Sponsors][bronze]
+
+<!-- links / references -->
+[silver]: https://opencollective.com/offlineimap-organization/tiers/silver-sponsor.svg "Our Silver Sponsors"
+[silver-zeronet-logo]: https://github.com/OfflineIMAP/offlineimap.github.io/raw/master/assets/img/sponsors/zeronet.svg
+[silver-zeronet-link]: https://zeronet.co.nz/ "Zeronet - naturally fast internet"
+[bronze]: https://opencollective.com/offlineimap-organization/tiers/bronze-sponsor.svg "Our Bronze Sponsors"

Changelog.md

@@ -15,6 +15,50 @@ Note to mainainers:
 * The following excerpt is only usefull when rendered in the website.
 {:toc}
 
+### OfflineIMAP v7.3.4 (2021-08-03)
+
+#### Notes
+
+The release is likely the last minor release. This project will be maintained
+for minor bug fixes only.
+
+In this version we've backported patches from the offlineimap3 project. There's
+no new features. Users should try this fork. The official project is there and
+is maintained by Rodolfo:
+
+  https://github.com/OfflineIMAP/offlineimap3
+
+This release was tested by:
+
+- Nicolas Sebrecht
+
+
+#### Authors
+
+- Nicolas Sebrecht (5)
+- Rodolfo García Peñas (kix) (4)
+- Martin Di Paola (2)
+- Reto Schnyder (1)
+
+
+#### Fixes
+
+- folder: IMAP: fix issue when the response of searchforheaders is the same UID multiple times. [Nicolas Sebrecht]
+- Fix hooks for IDLE sync. [Reto Schnyder]
+- Changed wrong comparison equal. [Rodolfo García Peñas (kix)]
+- Comparison error. [Rodolfo García Peñas (kix)]
+- remove outdated links to travis. [Nicolas Sebrecht]
+- ui init is lintian clean. [Rodolfo García Peñas (kix)]
+- Require the minimal dependencies in python package. [Martin Di Paola]
+
+#### Changes
+
+- README: update regarding the offlineimap3 fork. [Nicolas Sebrecht]
+- redirect the users to offlineimap3. [Nicolas Sebrecht]
+- threadutil imports not used. [Rodolfo García Peñas (kix)]
+- Move out pkg attributes from __init__.py. [Martin Di Paola]
+
+
 ### OfflineIMAP v7.3.3 (2020-04-11)
 
 #### Notes

README.md

@@ -1,14 +1,8 @@
-Upstream status (`master` branch):
-[![OfflineIMAP build status on Travis-CI.org](https://travis-ci.org/OfflineIMAP/offlineimap.svg?branch=master)](https://travis-ci.org/OfflineIMAP/offlineimap)
-[![OfflineIMAP code coverage on Codecov.io](https://codecov.io/gh/OfflineIMAP/offlineimap/branch/master/graph/badge.svg)](https://codecov.io/gh/OfflineIMAP/offlineimap)
-[![Gitter chat](https://badges.gitter.im/OfflineIMAP/offlineimap.png)](https://gitter.im/OfflineIMAP/offlineimap)
-
-Upstream status (`next` branch):
-[![OfflineIMAP build status on Travis-CI.org](https://travis-ci.org/OfflineIMAP/offlineimap.svg?branch=next)](https://travis-ci.org/OfflineIMAP/offlineimap)
 
 Financial contributors: [![Financial Contributors on Open Collective](https://opencollective.com/offlineimap-organization/all/badge.svg?label=financial+contributors)](https://opencollective.com/offlineimap-organization) 
 
 [offlineimap]: http://github.com/OfflineIMAP/offlineimap
+[offlineimap3]: http://github.com/OfflineIMAP/offlineimap3
 [website]: http://www.offlineimap.org
 [wiki]: http://github.com/OfflineIMAP/offlineimap/wiki
 [blog]: http://www.offlineimap.org/posts.html
@@ -23,7 +17,14 @@ Links:
 
 ***"Get the emails where you need them."***
 
-[Official offlineimap][offlineimap].
+> IMPORTANT NOTE: This repository is for python2 only. The support for offlineimap3
+> is happening in [Official offlineimap for python3][offlineimap3].
+>
+> I'll still lazily maintain this legacy offlineimap but users should definitely go with
+> offlineimap3.
+
+- [Official offlineimap for python3][offlineimap3].
+- [Official offlineimap for python2][offlineimap].
 
 
 ## Description
@@ -45,22 +46,9 @@ message without internet connection? No problem, the message is still there.
 
 ## Project status and future
 
-> As one of the maintainer of OfflineIMAP, I'd like to put my efforts into
-> [imapfw](http://github.com/OfflineIMAP/imapfw). **imapfw** is software in
-> development that I intend to replace OfflineIMAP with in the long term.
->
-> That's why I'm not going to continue OfflineIMAP development. I'll continue
-> to maintain OfflineIMAP (fixing small bugs, reviewing patches and merging,
-> and rolling out new releases), but that's all.
->
-> While I keep tracking issues for OfflineIMAP, you should not expect future support.
->
-> You won't be left at the side. OfflineIMAP's community is large enough so that
-> you'll find people for most of your issues.
->
-> Get news from the [blog][blog].
->
->                                  Nicolas Sebrecht. ,-)
+The [offlineimap][offlineimap] project was forked to
+[offlineimap3][offlineimap3] to support python3. Contributions are welcome to
+this project.
 
 
 ## Contributors
@@ -137,14 +125,15 @@ Bugs, issues and contributions can be requested to both the mailing list or the
 
 ## Requirements & dependencies
 
-* Python v2.7+
+* Python v2.7.x
 * six (required)
 * rfc6555 (required)
 * imaplib2 >= 2.57 (optional)
 * gssapi (optional), for Kerberos authentication
 * portalocker (optional), if you need to run offlineimap in Cygwin for Windows
 
-* Python v3.4+ ***[STALLED] (experimental: [see known issues](https://github.com/OfflineIMAP/offlineimap/issues?q=is%3Aissue+is%3Aopen+label%3APy3))***
+* Python v3: See the [offlineimap3][offlineimap3] fork of
+  [offlineimap][offlineimap].
 
 ## Documentation
 

contrib/helpers.py

@@ -204,9 +204,8 @@ class OfflineimapInfo(object):
         cmd = shlex.split("./offlineimap.py --version")
         return run(cmd).rstrip().decode(FS_ENCODING)
 
-    def editInit(self):
-        return system("{} ./offlineimap/__init__.py".format(EDITOR))
-
+    def editVersion(self):
+        return system("{} ./offlineimap/version.py".format(EDITOR))
 
 
 class User(object):

contrib/release.py

@@ -357,7 +357,7 @@ class Release(object):
         User.request("going to make a new release after {}".format(currentVersion))
 
     def updateVersion(self):
-        self.offlineimapInfo.editInit()
+        self.offlineimapInfo.editVersion()
 
     def checkVersions(self, current, new):
         if new == current:
@@ -405,7 +405,7 @@ class Release(object):
         announce.close()
 
     def make(self):
-        Git.add('offlineimap/__init__.py')
+        Git.add('offlineimap/version.py')
         Git.add('Changelog.md')
         commitMsg = "v{}\n".format(newVersion)
         for tester in self.testers.getListOk():

offlineimap/__init__.py

@@ -1,18 +1,17 @@
 __all__ = ['OfflineImap']
 
-__productname__ = 'OfflineIMAP'
-# Expecting trailing "-rcN" or "" for stable releases.
-__version__     = "7.3.3"
-__copyright__   = "Copyright 2002-2020 John Goerzen & contributors"
-__author__      = "John Goerzen"
-__author_email__= "offlineimap-project@lists.alioth.debian.org"
-__description__ = "Disconnected Universal IMAP Mail Synchronization/Reader Support"
-__license__  = "Licensed under the GNU GPL v2 or any later version (with an OpenSSL exception)"
-__bigcopyright__ = """%(__productname__)s %(__version__)s
-  %(__license__)s""" % locals()
-__homepage__ = "http://www.offlineimap.org"
-
-banner = __bigcopyright__
+from offlineimap.version import (
+        __productname__,
+        __version__,
+        __copyright__,
+        __author__,
+        __author_email__,
+        __description__,
+        __license__,
+        __bigcopyright__,
+        __homepage__,
+        banner
+        )
 
 from offlineimap.error import OfflineImapError
 # put this last, so we don't run into circular dependencies using

offlineimap/folder/IMAP.py

@@ -402,6 +402,7 @@ class IMAPFolder(BaseFolder):
             return 0
 
         matchinguids = matchinguids.split(' ')
+        matchinguids = list(set(matchinguids)) # Remove duplicates.
         self.ui.debug('imap', '__savemessage_searchforheader: matchinguids now '
             + repr(matchinguids))
         if len(matchinguids) != 1 or matchinguids[0] is None:

offlineimap/imapserver.py

@@ -102,7 +102,7 @@ class IMAPServer(object):
         self.starttls = repos.getstarttls()
 
         if self.usessl \
-           and self.tlslevel is not "tls_compat" \
+           and self.tlslevel != "tls_compat" \
            and self.sslversion is None:
             raise Exception("When 'tls_level' is not 'tls_compat' "
                 "the 'ssl_version' must be set explicitly.")
@@ -823,11 +823,12 @@ class IdleThread(object):
         statusrepos = account.statusrepos
         remotefolder = remoterepos.getfolder(self.folder, decode=False)
 
-        hook = account.getconf('presynchook', '')
-        account.callhook(hook)
+        hook_env = {
+            'OIMAP_ACCOUNT_NAME': account.getname(),
+        }
+        account.callhook('presynchook', hook_env)
         offlineimap.accounts.syncfolder(account, remotefolder, quick=False)
-        hook = account.getconf('postsynchook', '')
-        account.callhook(hook)
+        account.callhook('postsynchook', hook_env)
 
         ui = getglobalui()
         ui.unregisterthread(currentThread()) #syncfolder registered the thread

offlineimap/repository/IMAP.py

@@ -545,7 +545,7 @@ class IMAPRepository(BaseRepository):
 
         :param foldername: Full path of the folder to be created."""
 
-        if foldername is '':
+        if foldername == '':
             return
 
         if self.getreference():

offlineimap/threadutil.py

@@ -15,13 +15,12 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-from threading import Lock, Thread, BoundedSemaphore, currentThread
+from threading import Lock, Thread, BoundedSemaphore
 try:
     from Queue import Queue, Empty
 except ImportError: # python3
     from queue import Queue, Empty
 import traceback
-import os.path
 from offlineimap.ui import getglobalui
 
 

offlineimap/ui/__init__.py

@@ -24,7 +24,7 @@ UI_LIST = {'ttyui': TTY.TTYUI,
            'syslog': Noninteractive.Syslog,
            'machineui': Machine.MachineUI}
 
-#add Blinkenlights UI if it imports correctly (curses installed)
+# add Blinkenlights UI if it imports correctly (curses installed)
 try:
     from offlineimap.ui import Curses
     UI_LIST['blinkenlights'] = Curses.Blinkenlights

offlineimap/version.py

@@ -0,0 +1,13 @@
+__productname__ = 'OfflineIMAP'
+# Expecting trailing "-rcN" or "" for stable releases.
+__version__     = "7.3.4"
+__copyright__   = "Copyright 2002-2021 John Goerzen & contributors"
+__author__      = "John Goerzen"
+__author_email__= "offlineimap-project@lists.alioth.debian.org"
+__description__ = "Disconnected Universal IMAP Mail Synchronization/Reader Support"
+__license__  = "Licensed under the GNU GPL v2 or any later version (with an OpenSSL exception)"
+__bigcopyright__ = """%(__productname__)s %(__version__)s
+  %(__license__)s""" % locals()
+__homepage__ = "http://www.offlineimap.org"
+
+banner = __bigcopyright__

requirements.txt

@@ -1,5 +1,5 @@
-# Requirements
-six
+# Minimal requirements defined in setup.py
+-e .
+# Extra "optional" requirements
 gssapi[kerberos]
 portalocker[cygwin]
-rfc6555

setup.py

@@ -5,7 +5,7 @@
 # IMAP synchronization
 # Module: installer
 # COPYRIGHT #
-# Copyright (C) 2002 - 2018 John Goerzen & contributors
+# Copyright (C) 2002 - 2020 John Goerzen & contributors
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -23,9 +23,13 @@
 
 import os
 from distutils.core import setup, Command
-import offlineimap
 import logging
-from test.OLItest import TextTestRunner, TestLoader, OLITestLib
+
+from os import path
+here = path.abspath(path.dirname(__file__))
+
+# load __version__, __doc__, __author_, ...
+exec(open(path.join(here, 'offlineimap', 'version.py')).read())
 
 class TestCommand(Command):
     """runs the OLI testsuite"""
@@ -42,6 +46,11 @@ class TestCommand(Command):
         pass
 
     def run(self):
+        # Import the test classes here instead of at the begin of the module
+        # to avoid an implicit dependency of the 'offlineimap' module
+        # in the setup.py (which may run *before* offlineimap is installed)
+        from test.OLItest import TextTestRunner, TestLoader, OLITestLib
+
         logging.basicConfig(format='%(message)s')
         # set credentials and OfflineImap command to be executed:
         OLITestLib(cred_file='./test/credentials.conf', cmd='./offlineimap.py')
@@ -49,20 +58,25 @@ class TestCommand(Command):
         #TODO: failfast does not seem to exist in python2.6?
         TextTestRunner(verbosity=2,failfast=True).run(suite)
 
+reqs = [
+    'six',
+    'rfc6555'
+    ]
 
 setup(name = "offlineimap",
-      version = offlineimap.__version__,
-      description = offlineimap.__description__,
-      long_description = offlineimap.__description__,
-      author = offlineimap.__author__,
-      author_email = offlineimap.__author_email__,
-      url = offlineimap.__homepage__,
+      version = __version__,
+      description = __description__,
+      long_description = __description__,
+      author = __author__,
+      author_email = __author_email__,
+      url = __homepage__,
       packages = ['offlineimap', 'offlineimap.folder',
                   'offlineimap.repository', 'offlineimap.ui',
                   'offlineimap.utils'],
       scripts = ['bin/offlineimap'],
-      license = offlineimap.__copyright__ + \
+      license = __copyright__ + \
                 ", Licensed under the GPL version 2",
-      cmdclass = { 'test': TestCommand}
+      cmdclass = { 'test': TestCommand},
+      install_requires = reqs
 )