Merge branch 'release-1.0.3'

README.md

@@ -105,11 +105,11 @@ The cpe package provides methods to get the value of components of a CPE Name (t
 Finally, the cpe package contains methods to convert any CPE Name defined under a particular style (URI version 2.3, WFN or formatted string) in other different styles:
 
 	>>> c23_uri.as_wfn()
-	'wfn:[part="o", vendor="redhat", product="enterprise_linux", version="4", update="update4"]'
+        'wfn:[part="a", vendor="hp", product="insight_diagnostics", version="8", update=ANY, edition=ANY, sw_edition="online", target_sw="win2003", target_hw="x64", other=ANY]'
 	>>> c23_uri.as_uri_2_3()
-	'cpe:/a:hp:insight_diagnostics:8::~~online~win2003~x64~'
+        'cpe:/a:hp:insight_diagnostics:8::~~online~win2003~x64~'
 	>>> c23_uri.as_fs()
-	'cpe:2.3:a:hp:?insight_diagnostics?:8.*:*:*:*:*:*:x32:*'
+        'cpe:2.3:a:hp:insight_diagnostics:8:*:*:*:online:win2003:x64:*'
 
 [--- Return to index ---](#index)
 

cpe/cpe2_3_wfn.py

@@ -163,9 +163,9 @@ def _parse(self):
 
                     # Logical value
                     strUpper = att_value.upper()
-                    if strUpper in CPEComponent2_3_WFN.VALUE_ANY:
+                    if strUpper == CPEComponent2_3_WFN.VALUE_ANY:
                         comp = CPEComponentAnyValue()
-                    elif strUpper in CPEComponent2_3_WFN.VALUE_NA:
+                    elif strUpper == CPEComponent2_3_WFN.VALUE_NA:
                         comp = CPEComponentNotApplicable()
                     else:
                         msg = "Invalid logical value '{0}'".format(att_value)

docs/conf.py

@@ -51,7 +51,7 @@
 # The short X.Y version.
 version = '1.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.2'
+release = '1.0.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -1,16 +1,14 @@
 # -*- coding: utf-8 -*-
 
 from setuptools import setup
-from setuptools import find_packages
 
-VERSION = '1.0.2'
+VERSION = '1.0.3'
 AUTHORS = u'Alejandro Galindo García, Roberto Abdelkader Martínez Pérez'
 EMAILS = 'galindo.garcia.alejandro@gmail.com, robertomartinezp@gmail.com'
 
 setup(name='cpe',
       version=VERSION,
-      summary='Implementation of versions 1.1, 2.2 and 2.3 of CPE specification.',
-      description='Package to create and operate with CPE Names of versions 1.1, 2.2 and 2.3 of Common Platform Enumeration (CPE) specification. The main functionality implemented is: naming, name matching and language matching.',
+      description='Implementation of versions 1.1, 2.2 and 2.3 of CPE specification.',
       classifiers=[
           "Development Status :: 3 - Alpha",
           "Intended Audience :: Developers",
@@ -27,7 +25,7 @@
       maintainer_email=EMAILS,
       license='GPLv3',
       url="https://github.com/galindale/cpe",
-      packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
+      long_description=open("README.md").read(),
       include_package_data=True,
       zip_safe=False,
       )