From 2c30934c2eb03a7544b8e63178be084ddeb2241d Mon Sep 17 00:00:00 2001
From: Thomas Adamcik <thomas@adamcik.no>
Date: Mon, 20 Jul 2015 17:01:40 +0200
Subject: [PATCH] core: Remove core "extension" as it is not needed for config

---
 mopidy/config/__init__.py |  4 ++++
 mopidy/core/__init__.py   |  1 -
 mopidy/core/ext.py        | 26 --------------------------
 setup.py                  |  1 -
 4 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 mopidy/core/ext.py

diff --git a/mopidy/config/__init__.py b/mopidy/config/__init__.py
index 3f1f978c..8d3fa376 100644
--- a/mopidy/config/__init__.py
+++ b/mopidy/config/__init__.py
@@ -15,6 +15,10 @@ from mopidy.internal import path, versioning
 
 logger = logging.getLogger(__name__)
 
+_core_schema = ConfigSchema('core')
+# MPD supports at most 10k tracks, some clients segfault when this is exceeded.
+_core_schema['max_tracklist_length'] = Integer(minimum=1, maximum=10000)
+
 _logging_schema = ConfigSchema('logging')
 _logging_schema['color'] = Boolean()
 _logging_schema['console_format'] = String()
diff --git a/mopidy/core/__init__.py b/mopidy/core/__init__.py
index 912856d0..720f9c38 100644
--- a/mopidy/core/__init__.py
+++ b/mopidy/core/__init__.py
@@ -2,7 +2,6 @@ from __future__ import absolute_import, unicode_literals
 
 # flake8: noqa
 from .actor import Core
-from .ext import Extension
 from .history import HistoryController
 from .library import LibraryController
 from .listener import CoreListener
diff --git a/mopidy/core/ext.py b/mopidy/core/ext.py
deleted file mode 100644
index 9b758119..00000000
--- a/mopidy/core/ext.py
+++ /dev/null
@@ -1,26 +0,0 @@
-from __future__ import absolute_import, unicode_literals
-
-import os
-
-import mopidy
-from mopidy import config, ext
-
-
-class Extension(ext.Extension):
-
-    dist_name = 'Mopidy-Core'
-    ext_name = 'core'
-    version = mopidy.__version__
-
-    def get_default_config(self):
-        conf_file = os.path.join(os.path.dirname(__file__), 'ext.conf')
-        return config.read(conf_file)
-
-    def get_config_schema(self):
-        schema = super(Extension, self).get_config_schema()
-        schema['max_tracklist_length'] = config.Integer(
-            minimum=1, maximum=10000)
-        return schema
-
-    def setup(self, registry):
-        pass  # core has nothing to register
diff --git a/setup.py b/setup.py
index 394431fc..ca121f74 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,6 @@ setup(
             'mopidy = mopidy.__main__:main',
         ],
         'mopidy.ext': [
-            'core = mopidy.core:Extension',
             'http = mopidy.http:Extension',
             'local = mopidy.local:Extension',
             'file = mopidy.file:Extension',