From d74f47ad58a7651dd45864c4c830d2f03bb4f859 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Sun, 23 Aug 2015 17:33:51 +0200
Subject: [PATCH] main: Remove warnings if old settings dirs and files exists

---
 docs/changelog.rst | 15 +++++++++++++++
 mopidy/__main__.py | 17 -----------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 741956b9..c999632b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,21 @@ Changelog
 This changelog is used to track all major changes to Mopidy.
 
 
+v1.2.0 (UNRELEASED)
+===================
+
+Feature release.
+
+Cleanups
+--------
+
+- Removed warning if :file:`~/.mopidy` exists. We stopped using this location
+  in 0.6, released in October 2011.
+
+- Removed warning if :file:`~/.config/mopidy/settings.py` exists. We stopped
+  using this settings file in 0.14, released in April 2013.
+
+
 v1.1.1 (UNRELEASED)
 ===================
 
diff --git a/mopidy/__main__.py b/mopidy/__main__.py
index 208d2ff1..fbc750af 100644
--- a/mopidy/__main__.py
+++ b/mopidy/__main__.py
@@ -83,7 +83,6 @@ def main():
 
         create_core_dirs(config)
         create_initial_config_file(args, extensions_data)
-        check_old_locations()
 
         verbosity_level = args.base_verbosity_level
         if args.verbosity_level:
@@ -191,22 +190,6 @@ def create_initial_config_file(args, extensions_data):
             config_file, encoding.locale_decode(error))
 
 
-def check_old_locations():
-    dot_mopidy_dir = path.expand_path(b'~/.mopidy')
-    if os.path.isdir(dot_mopidy_dir):
-        logger.warning(
-            'Old Mopidy dot dir found at %s. Please migrate your config to '
-            'the ini-file based config format. See release notes for further '
-            'instructions.', dot_mopidy_dir)
-
-    old_settings_file = path.expand_path(b'$XDG_CONFIG_DIR/mopidy/settings.py')
-    if os.path.isfile(old_settings_file):
-        logger.warning(
-            'Old Mopidy settings file found at %s. Please migrate your '
-            'config to the ini-file based config format. See release notes '
-            'for further instructions.', old_settings_file)
-
-
 def log_extension_info(all_extensions, enabled_extensions):
     # TODO: distinguish disabled vs blocked by env?
     enabled_names = set(e.ext_name for e in enabled_extensions)