From 7d33e0e3a24970c3be70c7416c831637d7502827 Mon Sep 17 00:00:00 2001
From: Roman Mogilatov <rmogilatov@gmail.com>
Date: Sun, 22 May 2016 17:01:27 +0300
Subject: [PATCH] Drop catalogs name attribute

---
 dependency_injector/catalogs/declarative.py | 23 +--------------------
 dependency_injector/catalogs/dynamic.py     | 15 +++-----------
 docs/main/changelog.rst                     |  1 +
 tests/catalogs/test_declarative.py          |  2 --
 tests/catalogs/test_dynamic.py              | 10 +++++----
 5 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/dependency_injector/catalogs/declarative.py b/dependency_injector/catalogs/declarative.py
index a6fc84a2..bc276efa 100644
--- a/dependency_injector/catalogs/declarative.py
+++ b/dependency_injector/catalogs/declarative.py
@@ -40,7 +40,6 @@ class DeclarativeCatalogMetaClass(type):
         else:
             cls._catalog = DynamicCatalog()
 
-        cls._catalog.name = '.'.join((cls.__module__, cls.__name__))
         cls._catalog.bind_providers(dict(providers))
 
         cls._cls_providers = dict(cls_providers)
@@ -48,16 +47,6 @@ class DeclarativeCatalogMetaClass(type):
 
         return cls
 
-    @property
-    def name(cls):
-        """Read-only property that represents catalog's name.
-
-        Catalog's name is catalog's module + catalog's class name.
-
-        :type: str
-        """
-        return cls._catalog.name
-
     @property
     def providers(cls):
         """Read-only dictionary of all providers.
@@ -159,7 +148,7 @@ class DeclarativeCatalogMetaClass(type):
 
         :rtype: str
         """
-        return '<{0}({1})>'.format(cls.name,
+        return '<{0}({1})>'.format('.'.join((cls.__module__, cls.__name__)),
                                    ', '.join(six.iterkeys(cls.providers)))
 
     __str__ = __repr__
@@ -202,16 +191,6 @@ class DeclarativeCatalog(object):
 
     __IS_CATALOG__ = True
 
-    @property
-    def name(self):
-        """Read-only property that represents catalog's name.
-
-        Catalog's name is catalog's module + catalog's class name.
-
-        :rtype: str
-        """
-        return self.__class__.name
-
     @property
     def providers(self):
         """Read-only dictionary of all providers.
diff --git a/dependency_injector/catalogs/dynamic.py b/dependency_injector/catalogs/dynamic.py
index 7269e4e1..f943b044 100644
--- a/dependency_injector/catalogs/dynamic.py
+++ b/dependency_injector/catalogs/dynamic.py
@@ -30,14 +30,6 @@ class DynamicCatalog(object):
 
         users_service = services.users()
 
-    .. py:attribute:: name
-
-        Catalog's name.
-
-        By default, it is catalog's module + catalog's class name.
-
-        :type: str
-
     .. py:attribute:: providers
 
         Dictionary of all providers.
@@ -63,7 +55,7 @@ class DynamicCatalog(object):
     provider_type = None
 
     __IS_CATALOG__ = True
-    __slots__ = ('name', 'providers', 'provider_names', 'overridden_by')
+    __slots__ = ('providers', 'provider_names', 'overridden_by')
 
     def __init__(self, **providers):
         """Initializer.
@@ -72,8 +64,6 @@ class DynamicCatalog(object):
         :type providers:
             dict[str, :py:class:`dependency_injector.providers.Provider`]
         """
-        self.name = '.'.join((self.__class__.__module__,
-                              self.__class__.__name__))
         self.providers = dict()
         self.provider_names = dict()
         self.overridden_by = tuple()
@@ -312,7 +302,8 @@ class DynamicCatalog(object):
 
         :rtype: str
         """
-        return '<{0}({1})>'.format(self.name,
+        return '<{0}({1})>'.format('.'.join((self.__class__.__module__,
+                                             self.__class__.__name__)),
                                    ', '.join(six.iterkeys(self.providers)))
 
     __str__ = __repr__
diff --git a/docs/main/changelog.rst b/docs/main/changelog.rst
index 001cf780..2ace8601 100644
--- a/docs/main/changelog.rst
+++ b/docs/main/changelog.rst
@@ -24,6 +24,7 @@ Development version
   - ``Config``
 - Drop method injections.
 - Drop catalog bundles.
+- Drop catalog's ``name`` attribute.
 - Drop backward compatibilities of 1.x.
 
 1.17.0
diff --git a/tests/catalogs/test_declarative.py b/tests/catalogs/test_declarative.py
index 0bf2a86d..37108a87 100644
--- a/tests/catalogs/test_declarative.py
+++ b/tests/catalogs/test_declarative.py
@@ -429,8 +429,6 @@ class InstantiationTests(unittest.TestCase):
 
     def test_access_instance_attributes(self):
         """Test accessing declarative catalog instance attributes."""
-        self.assertEqual(self.catalog.name,
-                         CatalogA.name)
         self.assertEqual(self.catalog.providers,
                          CatalogA.providers)
         self.assertEqual(self.catalog.cls_providers,
diff --git a/tests/catalogs/test_dynamic.py b/tests/catalogs/test_dynamic.py
index d4743bf6..6bf40451 100644
--- a/tests/catalogs/test_dynamic.py
+++ b/tests/catalogs/test_dynamic.py
@@ -19,7 +19,6 @@ class DynamicCatalogTests(unittest.TestCase):
         """Set test environment up."""
         self.catalog = catalogs.DynamicCatalog(p1=providers.Provider(),
                                                p2=providers.Provider())
-        self.catalog.name = 'TestCatalog'
 
     def test_providers(self):
         """Test `di.DeclarativeCatalog.inherited_providers` contents."""
@@ -214,6 +213,9 @@ class DynamicCatalogTests(unittest.TestCase):
 
     def test_repr(self):
         """Test catalog representation."""
-        self.assertIn('TestCatalog', repr(self.catalog))
-        self.assertIn('p1', repr(self.catalog))
-        self.assertIn('p2', repr(self.catalog))
+        representation = repr(self.catalog)
+
+        self.assertIn('dependency_injector.catalogs.dynamic.DynamicCatalog',
+                      representation)
+        self.assertIn('p1', representation)
+        self.assertIn('p2', representation)