diff options
| author | Raphaël Barrois <raphael.barrois@polyconseil.fr> | 2012-05-15 16:41:18 +0200 |
|---|---|---|
| committer | Raphaël Barrois <raphael.barrois@polyconseil.fr> | 2012-05-15 16:41:18 +0200 |
| commit | 8b860d58802d6dd7de21fcdbc7f0e19584d78dfc (patch) | |
| tree | cbb78e5990e30ebfcf1e4c98d4ecd444cb9a12a8 | |
| parent | 789e7ab6f29e1da8d8aee26bddca5f098d8a0d4b (diff) | |
| download | semantic-version-8b860d58802d6dd7de21fcdbc7f0e19584d78dfc.tar.gz | |
Rename 'RequirementSpec' to 'Spec'.
Signed-off-by: Raphaël Barrois <raphael.barrois@polyconseil.fr>
| -rw-r--r-- | src/semantic_version/__init__.py | 2 | ||||
| -rw-r--r-- | src/semantic_version/base.py | 4 | ||||
| -rwxr-xr-x | tests/test_match.py | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/semantic_version/__init__.py b/src/semantic_version/__init__.py index 18019f6..93703a4 100644 --- a/src/semantic_version/__init__.py +++ b/src/semantic_version/__init__.py @@ -5,4 +5,4 @@ __version__ = '0.1.0' -from .base import compare, match, SemanticVersion, RequirementSpec +from .base import compare, match, SemanticVersion, Spec diff --git a/src/semantic_version/base.py b/src/semantic_version/base.py index c9a5fef..72852b1 100644 --- a/src/semantic_version/base.py +++ b/src/semantic_version/base.py @@ -210,7 +210,7 @@ class SemanticVersion(object): return 0 -class RequirementSpec(object): +class Spec(object): """A requirement specification.""" KIND_LT = '<' @@ -267,4 +267,4 @@ def compare(v1, v2): def match(spec, version): - return RequirementSpec(spec).match(SemanticVersion(version)) + return Spec(spec).match(SemanticVersion(version)) diff --git a/tests/test_match.py b/tests/test_match.py index 5c042f5..efd29e0 100755 --- a/tests/test_match.py +++ b/tests/test_match.py @@ -68,19 +68,19 @@ class MatchTestCase(unittest.TestCase): def test_invalid(self): for invalid in self.invalid_specs: - self.assertRaises(ValueError, semantic_version.RequirementSpec, invalid) + self.assertRaises(ValueError, semantic_version.Spec, invalid) def test_simple(self): for valid in self.valid_specs: - version = semantic_version.RequirementSpec(valid) + version = semantic_version.Spec(valid) self.assertEqual(valid, str(version)) def test_match(self): for spec_txt, versions in self.matches.items(): - spec = semantic_version.RequirementSpec(spec_txt) + spec = semantic_version.Spec(spec_txt) + self.assertNotEqual(spec, spec_txt) for version_txt in versions: version = semantic_version.SemanticVersion(version_txt) - self.assertTrue(spec.match(version), "%r does not match %r" % (version, spec)) self.assertTrue(semantic_version.match(spec_txt, version_txt)) |