From 2e678ffe8fc29990643cd6fe64299ce7f849039d Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Tue, 2 Apr 2013 12:07:35 +0200
Subject: [PATCH] ext: Change entry point from 'mopidy.extension' to
 'mopidy.ext' to be more consistent

---
 docs/extensiondev.rst | 4 ++--
 mopidy/__main__.py    | 2 +-
 setup.py              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/extensiondev.rst b/docs/extensiondev.rst
index c55eb6e4..71ea9ec0 100644
--- a/docs/extensiondev.rst
+++ b/docs/extensiondev.rst
@@ -126,7 +126,7 @@ the PyPI registration.
 
 The package must have ``install_requires`` on ``setuptools`` and ``Mopidy``, in
 addition to any other dependencies required by your extension. The
-``entry_points`` part must be included. The ``mopidy.extension`` part cannot be
+``entry_points`` part must be included. The ``mopidy.ext`` part cannot be
 changed, but the innermost string should be changed. It's format is
 ``ext_name = package_name:Extension``. ``ext_name`` should be a short
 name for your extension, typically the part after "Mopidy-" in lowercase. This
@@ -166,7 +166,7 @@ class that will connect the rest of the dots.
             'pysoundspot',
         ],
         entry_points={
-            b'mopidy.extension': [
+            b'mopidy.ext': [
                 'soundspot = mopidy_soundspot:Extension',
             ],
         },
diff --git a/mopidy/__main__.py b/mopidy/__main__.py
index 44ec38d5..87a93865 100644
--- a/mopidy/__main__.py
+++ b/mopidy/__main__.py
@@ -130,7 +130,7 @@ def check_old_folders():
 
 def load_extensions():
     extensions = []
-    for entry_point in pkg_resources.iter_entry_points('mopidy.extension'):
+    for entry_point in pkg_resources.iter_entry_points('mopidy.ext'):
         logger.debug('Loading extension %s', entry_point.name)
 
         # TODO Filter out disabled extensions
diff --git a/setup.py b/setup.py
index 8d3d6d5a..3c0b7c4c 100644
--- a/setup.py
+++ b/setup.py
@@ -44,7 +44,7 @@ setup(
             'mopidy = mopidy.__main__:main',
             'mopidy-scan = mopidy.scanner:main',
         ],
-        b'mopidy.extension': [
+        b'mopidy.ext': [
             'http = mopidy.frontends.http:Extension [http]',
             'lastfm = mopidy.frontends.lastfm:Extension [lastfm]',
             'local = mopidy.backends.local:Extension',