Fix typos

CODE_OF_CONDUCT.md

@@ -1,7 +1,7 @@
 
 # Realistic Code of Conduct
 
-1. We mostly care about making our softwares better.
+1. We mostly care about making our software better.
 
 2. Everybody is free to decide how to contribute.
 

contrib/release.py

@@ -279,7 +279,7 @@ def updateAPI(self):
         except:
             print(("""
 Oops! you don't have {} installed?"
-Cannot update the webite documentation..."
+Cannot update the website documentation..."
 You should install it and manually run:"
   $ cd {}"
   $ make websitedoc"

contrib/release.sh

@@ -186,7 +186,7 @@ function changelog_template_part1 () {
   cat <<EOF
 // vim: expandtab ts=2 syntax=markdown
 
-// WARNING: let at least one empy line before the real content.
+// WARNING: let at least one empty line before the real content.
 //
 // Write a new Changelog entry.
 //
@@ -319,7 +319,7 @@ function update_website () {
     if test ! $? -eq 0
     then
       echo "Oops! you don't have $SPHINXBUILD installed?"
-      echo "Cannot update the webite documentation..."
+      echo "Cannot update the website documentation..."
       echo "You should install it and run:"
       echo "  $ cd docs"
       echo "  $ make websitedoc"

contrib/store-pw-with-gpg/offlineimaprc.sample

@@ -20,7 +20,7 @@ localrepository = account2-local
 remoterepository = account2-remote
 status_backend = sqlite
 
-# thi sis a gmail account
+# this is a gmail account
 [Repository account1-local]
 type = Maildir
 # create with maildirmake or by hand by creating cur, new, tmp

docs/website-doc.sh

@@ -163,7 +163,7 @@ do
       echo "Usage: website-doc.sh <releases|api|contrib|usage>"
       ;;
     *)
-      echo "unkown option $arg"
+      echo "unknown option $arg"
       exit_code=$(( $exit_code + 1 ))
       ;;
   esac

offlineimap.conf

@@ -1087,7 +1087,7 @@ remoteuser = username
 #   https://github.com/OfflineIMAP/offlineimap/issues/299#issuecomment-331243827)
 #
 # WARNING: with this option enabled:
-# - compatibility with any other version is NOT GUARANTED (including newer);
+# - compatibility with any other version is NOT GUARANTEED (including newer);
 # - no support is provided.
 #
 # DEPRECATION:
@@ -1330,7 +1330,7 @@ remoteuser = username
 # This option stands in the [Repository RemoteExample] section.
 #
 # Enable 1-way synchronization. When setting 'readonly' to True, this
-# repository will not be modified during synchronization. Usefull to
+# repository will not be modified during synchronization. Useful to
 # e.g. backup an IMAP server. The readonly setting can be applied to any
 # type of Repository (Maildir, Imap, etc).
 #
@@ -1349,7 +1349,7 @@ remoteuser = username
 #
 # The pythonfile must be set to import any required library.
 #
-# This example plays a sound file of your chosing when new mail arrives.
+# This example plays a sound file of your choosing when new mail arrives.
 #
 #newmail_hook = lambda: os.system(
 #"cvlc --play-and-stop --play-and-exit /path/to/sound/file.mp3 > /dev/null 2>&1")
@@ -1406,7 +1406,7 @@ remoteuser = username
 # In addition we provide defaults for "oauth2_request_url",
 # "trashfolder" and "spamfolder".
 #
-# All of the defaults we provide can be overriden. E.g. you can
+# All of the defaults we provide can be overridden. E.g. you can
 # override "remotehost"/"remoteport"/"ssl" if you'd like to connect to
 # imap.gmail.com via a local stunnel instead of directly.
 #

offlineimap/CustomConfig.py

@@ -195,19 +195,19 @@ def getconfig(self):
         """Returns CustomConfigParser object that we will use
         for all our actions.
 
-        Must be overriden in all classes that use this mix-in."""
+        Must be overridden in all classes that use this mix-in."""
 
         raise NotImplementedError("ConfigHelperMixin.getconfig() "
-                                  "is to be overriden")
+                                  "is to be overridden")
 
     def getsection(self):
         """Returns name of configuration section in which our
         class keeps its configuration.
 
-        Must be overriden in all classes that use this mix-in."""
+        Must be overridden in all classes that use this mix-in."""
 
         raise NotImplementedError("ConfigHelperMixin.getsection() "
-                                  "is to be overriden")
+                                  "is to be overridden")
 
     def getconf(self, option, default=CustomConfigDefault):
         """Retrieves string from the configuration.

offlineimap/folder/Base.py

@@ -134,7 +134,7 @@ def getname(self):
         return self.name
 
     def __str__(self):
-        # FIMXE: remove calls of this. We have getname().
+        # FIXME: remove calls of this. We have getname().
         return self.name
 
     def __unicode__(self):
@@ -272,7 +272,7 @@ def check_uidvalidity(self):
         concurrent threads.
 
         :returns: Boolean indicating the match. Returns True in case it
-            implicitely saved the UIDVALIDITY."""
+            implicitly saved the UIDVALIDITY."""
 
         if self.get_saveduidvalidity() is not None:
             return self.get_saveduidvalidity() == self.get_uidvalidity()
@@ -350,7 +350,7 @@ def ismessagelistempty(self):
         return False
 
     def dropmessagelistcache(self):
-        """Empty everythings we know about messages."""
+        """Empty everything we know about messages."""
 
         self.messagelist = {}
 
@@ -697,7 +697,7 @@ def addmessageheader(self, msg, headername, headervalue):
         return
 
     def getmessageheader(self, msg, headername):
-        """Return the value of an undefined occurence of the given header.
+        """Return the value of an undefined occurrence of the given header.
 
         Header name is case-insensitive.
 
@@ -1028,7 +1028,7 @@ def __syncmessagesto_delete(self, dstfolder, statusfolder):
 
         if len(deletelist):
             # Delete in statusfolder first to play safe. In case of abort, we
-            # won't lose message, we will just unneccessarily retransmit some.
+            # won't lose message, we will just unnecessarily retransmit some.
             # Delete messages from statusfolder that were either deleted by the
             # user, or not being tracked (e.g. because of maxage).
             if not self.repository.account.dryrun:

offlineimap/folder/Gmail.py

@@ -180,7 +180,7 @@ def savemessage(self, uid, msg, flags, rtime):
         This backend always assigns a new uid, so the uid arg is ignored.
 
         This function will update the self.messagelist dict to contain
-        the new message after sucessfully saving it, including labels.
+        the new message after successfully saving it, including labels.
 
         See folder/Base for details. Note that savemessage() does not
         check against dryrun settings, so you need to ensure that

offlineimap/folder/IMAP.py

@@ -395,7 +395,7 @@ def __generate_randomheader(self, msg, policy=None):
         # mail twice (e.g. in different folders), we would still need to
         # get the UID for the correct one. As we won't have too many
         # mails with identical content, the randomness requirements are
-        # not extremly critial though.
+        # not extremely critical though.
 
         # Compute unsigned crc32 of 'msg' (as bytes) into a unique hash.
         # NB: crc32 returns unsigned only starting with python 3.0.
@@ -626,7 +626,7 @@ def savemessage(self, uid, msg, flags, rtime):
         This backend always assigns a new uid, so the uid arg is ignored.
 
         This function will update the self.messagelist dict to contain
-        the new message after sucessfully saving it.
+        the new message after successfully saving it.
 
         See folder/Base for details. Note that savemessage() does not
         check against dryrun settings, so you need to ensure that
@@ -783,15 +783,15 @@ def savemessage(self, uid, msg, flags, rtime):
                     # Now, read the UID field
                     uid = int(s_uid[-1].split(' ')[1])
                 except ValueError:
-                    uid = 0  # Definetly not what we should have.
+                    uid = 0  # Definitely not what we should have.
                 except Exception:
                     raise OfflineImapError("Unexpected response: %s" %
                                            str(resp),
                                            OfflineImapError.ERROR.MESSAGE)
                 if uid == 0:
                     self.ui.warn("savemessage: Server supports UIDPLUS, but"
                                  " we got no usable UID back. APPENDUID "
-                                 "reponse was '%s'" % str(resp))
+                                 "response was '%s'" % str(resp))
             else:
                 try:
                     # We don't use UIDPLUS.
@@ -812,7 +812,7 @@ def savemessage(self, uid, msg, flags, rtime):
                                      "Could not determine new UID on %s." %
                                      self.getname())
                 # Something wrong happened while trying to get the UID. Explain
-                # the error might be about the 'get UID' process not necesseraly
+                # the error might be about the 'get UID' process not necessarily
                 # the APPEND.
                 except Exception:
                     self.ui.warn("%s: could not determine the UID while we got "
@@ -898,7 +898,7 @@ def _fetch_from_imap(self, uids, retry_num=1):
         # originally a fixed, utf-8 conversion was done and *only* the first
         # response (d[0]) was returned.  Note that this alters the behavior
         # between code bases.  However, it seems like a single UID is the intent
-        # of this function so retaining the modfication here for now.
+        # of this function so retaining the modification here for now.
         # 
         # TODO: Can we assume the server response containing the meta data is
         # always 'utf-8' encoded?  Assuming yes for now.

offlineimap/folder/LocalStatusSQLite.py

@@ -89,7 +89,7 @@ def __init__(self, name, repository):
                               dirname)
 
         self.connection = None
-        # The lock serialize the writing/open/close of database accross threads.
+        # The lock serialize the writing/open/close of database across threads.
         if self.filename not in LocalStatusSQLiteFolder.locks:
             LocalStatusSQLiteFolder.locks[self.filename] = DatabaseFileLock()
         self._databaseFileLock = LocalStatusSQLiteFolder.locks[self.filename]

offlineimap/imaputil.py

@@ -248,7 +248,7 @@ def __split_quoted(s):
         next_q = rest.find(q)
         if next_q == -1:
             raise ValueError("can't find ending quote '%s' in '%s'" % (q, s))
-        # If quote is preceeded by even number of backslashes,
+        # If quote is preceded by even number of backslashes,
         # then it is the ending quote, otherwise the quote
         # character is escaped by backslash, so we should
         # continue our search.

offlineimap/localeval.py

@@ -20,7 +20,7 @@
 
 
 class LocalEval:
-    """Here is a powerfull but very dangerous option, of course."""
+    """Here is a powerful but very dangerous option, of course."""
 
     def __init__(self, path=None):
         self.namespace = {}

offlineimap/repository/IMAP.py

@@ -322,7 +322,7 @@ def getsslclientkey(self):
     def getsslcacertfile(self):
         """Determines CA bundle.
 
-        Returns path to the CA bundle.  It is either explicitely specified
+        Returns path to the CA bundle.  It is either explicitly specified
         or requested via "OS-DEFAULT" value (and we will search known
         locations for the current OS and distribution).
 
@@ -333,7 +333,7 @@ def getsslcacertfile(self):
         It is also an error to specify non-existent file via configuration:
         it will error out later, but, perhaps, with less verbose explanation,
         so we will also throw an exception.  It is consistent with
-        the above behaviour, so any explicitely-requested configuration
+        the above behaviour, so any explicitly-requested configuration
         that doesn't result in an existing file will give an exception.
         """
         xforms = [os.path.expanduser, os.path.expandvars, os.path.abspath]
@@ -699,7 +699,7 @@ def getfolders(self):
         try:
             imapobj = self.imapserver.acquireconnection()
         except OfflineImapError as e:
-            err_msg = f"Error adquiring connection for repository {self.name}: {str(e)}"
+            err_msg = f"Error acquiring connection for repository {self.name}: {str(e)}"
             raise OfflineImapError(err_msg, OfflineImapError.ERROR.REPO, exc_info()[2])
 
         # check whether to list all folders, or subscribed only

offlineimap/ui/Curses.py

@@ -372,7 +372,7 @@ def setup_consolehandler(self):
         # add the handlers to the logger
         self.logger.addHandler(ch)
         # the handler is not usable yet. We still need all the
-        # intialization stuff currently done in init_banner. Move here?
+        # initialization stuff currently done in init_banner. Move here?
         return ch
 
     def isusable(s):
@@ -424,7 +424,7 @@ def init_banner(self):
         # set log handlers ui to ourself
         self._log_con_handler.ui = self
         self.setupwindows()
-        # Settup keyboard handler
+        # Set up keyboard handler
         self.inputhandler = InputHandler(self)
         self.inputhandler.set_char_hdlr(self.on_keypressed)
 

offlineimap/ui/UIBase.py

@@ -66,7 +66,7 @@ def __init__(self, config, loglevel=logging.INFO):
         # linking active accounts with the time.time() when sync started
         self.logfile = None
         self.exc_queue = Queue()
-        # saves all occuring exceptions, so we can output them at the end
+        # saves all occurring exceptions, so we can output them at the end
         self.uidval_problem = False
         # at least one folder skipped due to UID validity problem
         # create logger with 'OfflineImap' app

tests/create_conf_file.py

@@ -6,7 +6,7 @@
 # Input: Seven shell environment variables.
 # Output: it writes the config settings to "filename" (./oli-travis.conf) and "additionalfilename" (./test/credentials.conf).
 # "filename" is used by normal run of ./offlineimap -c ./oli-travis.conf , "additionalfilename" is used by "pytest".
-# They are the same conf file, copie to two different locations for convenience.
+# They are the same conf file, copied to two different locations for convenience.
 
 import os
 import shutil