Remove old code for deprecations

CHANGELOG.rst

@@ -15,7 +15,18 @@ Version 0.11.0
 - Discovery is no longer automatically done when running ``vdirsyncer sync``.
   ``vdirsyncer discover`` now has to be explicitly called.
 - Add a ``.plist`` example for Mac OS X.
-- Usage under Python 2 now requires a special config parameter to be set.
+- Usage under Python 2 now requires a special config parameter to be set.  -
+  Various deprecated configuration parameters do no longer have specialized
+  errormessages. The generic error message for unknown parameters is shown.
+
+  - Vdirsyncer no longer warns that the ``passwordeval`` parameter has been
+    renamed to ``password_command``.
+
+  - The ``keyring`` fetching strategy has been dropped some versions ago, but
+    the specialized error message has been dropped.
+
+  - A old status format from version 0.4 is no longer supported. If you're
+    experiencing problems, just delete your status folder.
 
 Version 0.10.0
 ==============

vdirsyncer/cli/config.py

@@ -30,11 +30,6 @@ def validate_section_name(name, section_type):
 
 
 def _validate_general_section(general_config):
-    if 'passwordeval' in general_config:
-        # XXX: Deprecation
-        cli_logger.warning('The `passwordeval` parameter has been renamed to '
-                           '`password_command`.')
-
     invalid = set(general_config) - GENERAL_ALL
     missing = GENERAL_REQUIRED - set(general_config)
     problems = []

vdirsyncer/cli/fetchparams.py

@@ -56,11 +56,6 @@ def _fetch_value(opts, key):
     try:
         strategy_fn = STRATEGIES[strategy]
     except KeyError:
-        if strategy == 'keyring':
-            # XXX: Deprecate
-            raise exceptions.UserError(
-                'Fetching passwords via keyring is deprecated. See the '
-                'changelog for migration paths.')
         raise exceptions.UserError('Unknown strategy: {}'.format(strategy))
 
     logger.debug('Fetching value for {} with {} strategy.'

vdirsyncer/cli/utils.py

@@ -368,15 +368,6 @@ def load_status(base_path, pair, collection=None, data_type=None):
         except ValueError:
             pass
 
-        # XXX: Deprecate
-        # Old status format, deprecated as of 0.4.0
-        # See commit 06a701bc10dac16ff0ff304eb7cb9f502b71cf95
-        f.seek(0)
-        try:
-            return dict(json.loads(line) for line in f)
-        except ValueError:
-            pass
-
     return {}