rpms/python-peak-rules/devel python-peak-rules-doctest.patch, 1.1, 1.2 python-peak-rules.spec, 1.6, 1.7

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/python-peak-rules/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21376

Modified Files:
	python-peak-rules-doctest.patch python-peak-rules.spec 
Log Message:

* Tue Dec 2 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5a1.dev-4.2582
- Update patch for some more doctest fixing under py2.6.


python-peak-rules-doctest.patch:

Index: python-peak-rules-doctest.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-rules/devel/python-peak-rules-doctest.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-peak-rules-doctest.patch	2 Dec 2008 22:21:34 -0000	1.1
+++ python-peak-rules-doctest.patch	2 Dec 2008 22:51:00 -0000	1.2
@@ -1,52 +1,72 @@
-diff -up PEAK-Rules-0.5a1.dev-r2581/Criteria.txt.test PEAK-Rules-0.5a1.dev-r2581/Criteria.txt
---- PEAK-Rules-0.5a1.dev-r2581/Criteria.txt.test	2008-12-02 12:47:12.000000000 -0800
-+++ PEAK-Rules-0.5a1.dev-r2581/Criteria.txt	2008-12-02 12:53:14.000000000 -0800
-@@ -302,8 +302,9 @@ of intersecting them will be a conjuncti
+Index: PEAK-Rules-0.5a1.dev-r2582/Criteria.txt
+===================================================================
+--- PEAK-Rules-0.5a1.dev-r2582.orig/Criteria.txt
++++ PEAK-Rules-0.5a1.dev-r2582/Criteria.txt
+@@ -302,8 +302,8 @@ of intersecting them will be a conjuncti
      >>> intersect(float, MySet([int, str]))
      MySet([<type 'float'>, <type 'int'>, <type 'str'>])
  
 -    >>> intersect(MySet([d, c]), MySet([int, str]))
 -    MySet([<class 'd'>, <class ...c...>, <type 'str'>])
-+    >>> result = intersect(MySet([d, c]), MySet([int, str]))
-+    >>> result == MySet([d, c, str])
++    >>> intersect(MySet([d, c]), MySet([int, str])) == MySet([d, c, str])
 +    True
  
  If you want to ensure that all items in a set are of appropriate type or value,
  you can override ``__init__`` to do the checking, and raise an appropriate
-@@ -974,8 +975,10 @@ will be AST-like structures.)
+@@ -462,13 +462,15 @@ contents.  In other words::
+     ... ])
+     True
+ 
+-    >>> intersect(int_or_str, Conjunction([long, float]))
+-    DisjunctionSet([Conjunction([<type 'int'>, <type 'long'>, <type 'float'>]),
+-                 Conjunction([<type 'str'>, <type 'long'>, <type 'float'>])])
+-
+-    >>> intersect(Conjunction([int, str]), long_or_float)
+-    DisjunctionSet([Conjunction([<type 'int'>, <type 'str'>, <type 'long'>]),
+-                 Conjunction([<type 'int'>, <type 'str'>, <type 'float'>])])
++    >>> intersect(int_or_str, Conjunction([long, float])) == DisjunctionSet([
++    ...     Conjunction([int, long, float]), Conjunction([str, long, float])
++    ... ])
++    True
++
++    >>> intersect(Conjunction([int, str]), long_or_float) == DisjunctionSet([
++    ...     Conjunction([int, str, long]), Conjunction([int, str, float])
++    ... ])
++    True
+ 
+ As you can see, this is the heart of the process that allows expressions like
+ ``(A or B) and (C or D)`` to be transformed into their disjunctive normal
+@@ -974,8 +976,10 @@ will be AST-like structures.)
  
  Creating a test with disjunct criteria actually returns a set of tests::
  
 -    >>> Test("x", DisjunctionSet([int, str]))
 -    DisjunctionSet([Test('x', <type 'int'>), Test('x', <type 'str'>)])
-+    >>> result = Test("x", DisjunctionSet([int, str]))
-+    >>> result == DisjunctionSet([Test('x', str),
-+    ...     Test('x', int)])
++    >>> Test("x", DisjunctionSet([int, str])) == DisjunctionSet([
++    ...     Test('x', str), Test('x', int)
++    ... ])
 +    True
  
  So the ``disjuncts()`` of a test will always just be the test itself::
  
-@@ -991,13 +994,14 @@ intact::
- But if the test criterion is a conjunction or range, negating it can produce
- a disjunction of tests::
- 
--    >>> negate(
-+    >>> result = negate(
+@@ -995,9 +999,10 @@ a disjunction of tests::
      ...     Test('x',
      ...         NotObjects([IsObject('foo',False), IsObject('bar',False)])
      ...     )
-     ... )
+-    ... )
 -    DisjunctionSet([Test('x', IsObject('foo', True)),
 -                    Test('x', IsObject('bar', True))])
-+    >>> result == DisjunctionSet([Test('x', IsObject('foo', True)),
-+    ...     Test('x', IsObject('bar', True))])
++    ... ) == DisjunctionSet([Test('x', IsObject('foo', True)),
++    ...     Test('x', IsObject('bar', True))
++    ... ])
 +    True
  
  Intersecting two tests for the same dispatch expression returns a test whose
  criterion is the intersection of the original tests' criteria::
-diff -up PEAK-Rules-0.5a1.dev-r2581/Indexing.txt.test PEAK-Rules-0.5a1.dev-r2581/Indexing.txt
---- PEAK-Rules-0.5a1.dev-r2581/Indexing.txt.test	2008-12-02 12:53:33.000000000 -0800
-+++ PEAK-Rules-0.5a1.dev-r2581/Indexing.txt	2008-12-02 13:29:28.000000000 -0800
+Index: PEAK-Rules-0.5a1.dev-r2582/Indexing.txt
+===================================================================
+--- PEAK-Rules-0.5a1.dev-r2582.orig/Indexing.txt
++++ PEAK-Rules-0.5a1.dev-r2582/Indexing.txt
 @@ -1083,6 +1083,7 @@ Value Map Generation
  --------------------
  


Index: python-peak-rules.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-peak-rules/devel/python-peak-rules.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-peak-rules.spec	2 Dec 2008 22:21:34 -0000	1.6
+++ python-peak-rules.spec	2 Dec 2008 22:51:01 -0000	1.7
@@ -13,7 +13,7 @@
 # Release:0.3.a1.dev%{devrev}%{?dist}
 # But we can't do that yet because it breaks the upgrade path.
 # When version hits 0.5.1 or 0.6 we can correct this.
-Release:        3.%{devrev}%{?dist}
+Release:        4.%{devrev}%{?dist}
 Summary:        Generic functions and business rules support systems
 
 Group:          Development/Languages
@@ -70,6 +70,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Tue Dec 2 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5a1.dev-4.2582
+- Update patch for some more doctest fixing under py2.6.
+
 * Tue Dec 2 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5a1.dev-3.2582
 - Update to latest development snapshot
 - Enable test suite