Merge branch 'ns/fix-copyright' into next

This commit is contained in:
Nicolas Sebrecht 2016-07-03 19:51:32 +02:00
commit 268adb782f

View File

@ -1,6 +1,5 @@
# Gmail IMAP folder support # Gmail IMAP folder support
# Copyright (C) 2008 Riccardo Murri <riccardo.murri@gmail.com> # Copyright (C) 2002-2016 John Goerzen & contributors.
# Copyright (C) 2002-2007 John Goerzen <jgoerzen@complete.org>
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
@ -17,6 +16,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
import re import re
import six
from sys import exc_info from sys import exc_info
from offlineimap import imaputil, OfflineImapError from offlineimap import imaputil, OfflineImapError
@ -24,8 +24,6 @@ from offlineimap import imaplibutil
import offlineimap.accounts import offlineimap.accounts
from .IMAP import IMAPFolder from .IMAP import IMAPFolder
import six
"""Folder implementation to support features of the Gmail IMAP server.""" """Folder implementation to support features of the Gmail IMAP server."""
class GmailFolder(IMAPFolder): class GmailFolder(IMAPFolder):