Changeset 59

Timestamp:

02/25/06 15:13:09 (7 years ago)

Author:

xi

Message:

Remove y/n from the boolean constants.

Location:

branches/pyyaml3000

Files:

• MANIFEST.in (added)
• Makefile (modified) (2 diffs)
• lib/yaml/constructor.py (modified) (1 diff)
• lib/yaml/resolver.py (modified) (1 diff)
• setup.py (modified) (1 diff)
• tests/data/bool.data (modified) (1 diff)
• tests/data/construct-bool.data (modified) (1 diff)
• tests/test_constructor.py (modified) (1 diff)
• tests/test_errors.py (modified) (2 diffs)

branches/pyyaml3000/Makefile

@@ -1 +1 @@
 
-.PHONY: default build force install test clean
+.PHONY: default build force install test dist-src clean
 
 PYTHON=/usr/bin/python
@@ -18 +18 @@
         ${PYTHON} tests/test_build.py ${TEST}
 
+dist-src:
+        ${PYTHON} setup.py sdist --formats=zip,gztar
+
 clean:
         ${PYTHON} setup.py clean -a

branches/pyyaml3000/lib/yaml/constructor.py

@@ -162 +162 @@
 
     bool_values = {
-        u'y':       True,
         u'yes':     True,
-        u'n':       False,
         u'no':      False,
         u'true':    True,

branches/pyyaml3000/lib/yaml/resolver.py

@@ -94 +94 @@
 Resolver.add_detector(
         u'tag:yaml.org,2002:bool',
-        re.compile(ur'''^(?:y|Y|yes|Yes|YES|n|N|no|No|NO
+        re.compile(ur'''^(?:yes|Yes|YES|n|N|no|No|NO
                     |true|True|TRUE|false|False|FALSE
                     |on|On|ON|off|Off|OFF)$''', re.X),

branches/pyyaml3000/setup.py

@@ -2 +2 @@
 NAME = 'PyYAML3000'
 VERSION = '0.1'
-DESCRIPTION = "YAML parser (and emitter)"
+DESCRIPTION = "The next generation YAML parser for Python"
 AUTHOR = "Kirill Simonov"
 AUTHOR_EMAIL = 'xi@resolvent.net'
-LICENSE = "BSD"
+LICENSE = "MIT"
 
 from distutils.core import setup

branches/pyyaml3000/tests/data/bool.data

@@ -1 @@
-- y
+- yes
 - NO
 - True

branches/pyyaml3000/tests/data/construct-bool.data

@@ -1 @@
-canonical: y
+canonical: yes
 answer: NO
 logical: True

branches/pyyaml3000/tests/test_constructor.py

@@ -5 +5 @@
 except ImportError:
     pass
+try:
+    set
+except NameError:
+    from sets import Set as set
 
 from yaml import *

branches/pyyaml3000/tests/test_errors.py

@@ -27 +27 @@
         #except ParserError, exc:
         #except ComposerError, exc:
+        #except ConstructorError, exc:
             #print '.'*70
             #print "%s:" % exc.__class__.__name__, exc
@@ -40 +41 @@
             constructor = Constructor(resolver)
             return list(constructor)
-        #except YAMLError, exc:
+        except YAMLError, exc:
         #except ScannerError, exc:
         #except ParserError, exc:
         #except ComposerError, exc:
-        except ConstructorError, exc:
-            print '.'*70
-            print "%s:" % filename
-            print "%s:" % exc.__class__.__name__, exc
+        #except ConstructorError, exc:
+            #print '.'*70
+            #print "%s:" % filename
+            #print "%s:" % exc.__class__.__name__, exc
             raise