Rename Spec to SpecItem and SpecList to SpecItem.

Signed-off-by: Raphaël Barrois <raphael.barrois@polyconseil.fr>

3 files changed, 16 insertions, 16 deletions

diff --git a/src/semantic_version/__init__.py b/src/semantic_version/__init__.py
index fb4cf2f..9075b70 100644
--- a/src/semantic_version/__init__.py
+++ b/src/semantic_version/__init__.py
@@ -5,4 +5,4 @@
 __version__ = '1.3.0-alpha'
 
 
-from .base import compare, match, Version, Spec, SpecList
+from .base import compare, match, Version, Spec, SpecItem
diff --git a/src/semantic_version/base.py b/src/semantic_version/base.py
index 7b26981..4f177b2 100644
--- a/src/semantic_version/base.py
+++ b/src/semantic_version/base.py
@@ -235,7 +235,7 @@ class Version(object):
         return 0
 
 
-class Spec(object):
+class SpecItem(object):
     """A requirement specification."""
 
     KIND_LT = '<'
@@ -299,10 +299,10 @@ class Spec(object):
         return '%s%s' % (self.kind, self.spec)
 
     def __repr__(self):
-        return '<Spec: %s %r>' % (self.kind, self.spec)
+        return '<SpecItem: %s %r>' % (self.kind, self.spec)
 
     def __eq__(self, other):
-        if not isinstance(other, Spec):
+        if not isinstance(other, SpecItem):
             return NotImplemented
         return self.kind == other.kind and self.spec == other.spec
 
@@ -310,7 +310,7 @@ class Spec(object):
         return hash((self.kind, self.spec))
 
 
-class SpecList(object):
+class Spec(object):
     def __init__(self, *specs_strings):
         subspecs = [self.parse(spec) for spec in specs_strings]
         self.specs = sum(subspecs, ())
@@ -318,7 +318,7 @@ class SpecList(object):
     @classmethod
     def parse(self, specs_string):
         spec_texts = specs_string.split(',')
-        return tuple(Spec(spec_text) for spec_text in spec_texts)
+        return tuple(SpecItem(spec_text) for spec_text in spec_texts)
 
     def match(self, version):
         return all(spec.match(version) for spec in self.specs)
@@ -335,10 +335,10 @@ class SpecList(object):
         return ','.join(str(spec) for spec in self.specs)
 
     def __repr__(self):
-        return '<SpecList: %r>' % (self.specs,)
+        return '<Spec: %r>' % (self.specs,)
 
     def __eq__(self, other):
-        if not isinstance(other, SpecList):
+        if not isinstance(other, Spec):
             return NotImplemented
 
         return set(self.specs) == set(other.specs)
diff --git a/src/semantic_version/django_fields.py b/src/semantic_version/django_fields.py
index 1495bd1..7cc5d44 100644
--- a/src/semantic_version/django_fields.py
+++ b/src/semantic_version/django_fields.py
@@ -46,31 +46,31 @@ class VersionField(BaseSemVerField):
         return base.Version(value, partial=self.partial)
 
 
-class SpecField(BaseSemVerField):
+class SpecItemField(BaseSemVerField):
     default_error_messages = {
         'invalid': _(u"Enter a valid version number spec in ==X.Y.Z format."),
     }
     description = _(u"Version specification")
 
     def to_python(self, value):
-        """Converts any value to a base.Spec field."""
+        """Converts any value to a base.SpecItem field."""
         if value is None or value == '':
             return value
-        if isinstance(value, base.Spec):
+        if isinstance(value, base.SpecItem):
             return value
-        return base.Spec(value)
+        return base.SpecItem(value)
 
 
-class SpecListField(BaseSemVerField):
+class SpecField(BaseSemVerField):
     default_error_messages = {
         'invalid': _(u"Enter a valid version number spec list in ==X.Y.Z,>=A.B.C format."),
     }
     description = _(u"Version specification list")
 
     def to_python(self, value):
-        """Converts any value to a base.SpecList field."""
+        """Converts any value to a base.Spec field."""
         if value is None or value == '':
             return value
-        if isinstance(value, base.SpecList):
+        if isinstance(value, base.Spec):
             return value
-        return base.SpecList(value)
+        return base.Spec(value)