Index: examples/python_tests/alice_rt1/alice.save
===================================================================
--- examples/python_tests/alice_rt1/alice.save	(revision e3462b4a59b42b4848b5ad88a611880e3200b047)
+++ examples/python_tests/alice_rt1/alice.save	(revision 549656e28a22f7ee432c5e808a001b46b98f7b5b)
@@ -12,5 +12,5 @@
 pParty.about_another_float(8) <- pMarchhare
 pParty.about_another_integer(-7) <- pMarchhare
-pParty.about_another_time(time(2020,11,01,18,29,30)) <- pMarchhare
+pParty.about_another_time(20201101T182930) <- pMarchhare
 pParty.about_boolean(true) <- pMarchhare
 pParty.about_float(-200.0) <- pMarchhare
@@ -18,9 +18,9 @@
 pParty.about_key(pTea) <- pMarchhare
 pParty.about_other_party(pTea,_,99,AAA,BBB,true,_) <- pMarchhare
-pParty.about(pTea,time(2010,10,10,00,00,00),true,4,-200.0,8,time(2012,02,05,18,29,30),'a list','file://usr/party/~teaparty') <- pParty.guestOf(pMarchhare)
+pParty.about(pTea,20101010T000000,true,4,-200.0,8,20120205T182930,'a list','file://usr/party/~teaparty') <- pParty.guestOf(pMarchhare)
 pParty.about_string2('a mangled \'string\'') <- pMarchhare
 pParty.about_string('a confused party') <- pMarchhare
 pParty.about_another_float(0.22) <- pMarchhare
-pParty.about_time(time(2020,11,01,00,00,00)) <- pMarchhare
+pParty.about_time(20201101T000000) <- pMarchhare
 pParty.about_urn('file://user/local/party/~sillyparty') <- pMarchhare
 pParty.friendOf(pAlice) <- pHatter
Index: examples/python_tests/alumni2_rt1/alumni2.save
===================================================================
--- examples/python_tests/alumni2_rt1/alumni2.save	(revision e3462b4a59b42b4848b5ad88a611880e3200b047)
+++ examples/python_tests/alumni2_rt1/alumni2.save	(revision 549656e28a22f7ee432c5e808a001b46b98f7b5b)
@@ -11,9 +11,9 @@
 pStateU.diploma('psychology',1962) <- pMaryann
 pStateU.diploma('zoology',1955) <- pJoe
-pStateU.foundingAlumni <- pStateU.diploma(_,Year:[1963,1961,1960])
+pStateU.foundingAlumni <- pStateU.diploma(_,Year:[1960,1961,1963])
 
 ===good============ stateU.foundingAlumni <- Bob
 YAP query succeed
-pStateU.foundingAlumni <- pStateU.diploma(_,Year:[1963,1961,1960])
+pStateU.foundingAlumni <- pStateU.diploma(_,Year:[1960,1961,1963])
 pStateU.diploma('mathmatics',1961) <- pBob
 
Index: examples/python_tests/alumni2_rt1/attr.py
===================================================================
--- examples/python_tests/alumni2_rt1/attr.py	(revision e3462b4a59b42b4848b5ad88a611880e3200b047)
+++ examples/python_tests/alumni2_rt1/attr.py	(revision 549656e28a22f7ee432c5e808a001b46b98f7b5b)
@@ -64,7 +64,7 @@
 
 # add specific target value for the integer range constraint
+cond.constraint_add_integer_target(1963)
+cond.constraint_add_integer_target(1961)
 cond.constraint_add_integer_target(1960)
-cond.constraint_add_integer_target(1961)
-cond.constraint_add_integer_target(1963)
 
 # create a paramter term that has a range constraint on it,
Index: examples/python_tests/alumni_rt1/alumni.save
===================================================================
--- examples/python_tests/alumni_rt1/alumni.save	(revision e3462b4a59b42b4848b5ad88a611880e3200b047)
+++ examples/python_tests/alumni_rt1/alumni.save	(revision 549656e28a22f7ee432c5e808a001b46b98f7b5b)
@@ -1,4 +1,4 @@
 % Restoring file /usr/local/lib/Yap/startup.yss
-  
+
 ...final principal set...
 (pBob,keyid,y) 
@@ -11,5 +11,5 @@
 pStateU.diploma('psychology',1956) <- pMaryann
 pStateU.diploma('zoology',1955) <- pJoe
-pStateU.foundingAlumni <- pStateU.diploma(_,Year:[1955 .. 1958])
+pStateU.foundingAlumni <- pStateU.diploma(_,Year:[1955..1958])
 
 ===bad============ stateU.foundingAlumni <- Bob
@@ -18,9 +18,9 @@
 ===good============ stateU.foundingAlumni <- Maryann
 YAP query succeed
-pStateU.foundingAlumni <- pStateU.diploma(_,Year:[1955 .. 1958])
+pStateU.foundingAlumni <- pStateU.diploma(_,Year:[1955..1958])
 pStateU.diploma('psychology',1956) <- pMaryann
 
 ===good============ stateU.foundingAlumni <- Joe
 YAP query succeed
-pStateU.foundingAlumni <- pStateU.diploma(_,Year:[1955 .. 1958])
+pStateU.foundingAlumni <- pStateU.diploma(_,Year:[1955..1958])
 pStateU.diploma('zoology',1955) <- pJoe
Index: examples/python_tests/balltime_rt2/ball.save
===================================================================
--- examples/python_tests/balltime_rt2/ball.save	(revision e3462b4a59b42b4848b5ad88a611880e3200b047)
+++ examples/python_tests/balltime_rt2/ball.save	(revision 549656e28a22f7ee432c5e808a001b46b98f7b5b)
@@ -1,4 +1,4 @@
 % Restoring file /usr/local/lib/Yap/startup.yss
-  
+
 ...final principal set...
 (pJohn,keyid,y) 
@@ -8,7 +8,7 @@
 ...final policy attribute set...
 pLeague.stadium('access',true,F:pLeague.gametime(T)) <- pLeague.players(T)
-pLeague.stadium('access',B:[true],F:[20120228T080000 .. 20120228T090000]) <- pLeague.players(T)
-pLeague.gametime('north') <- time(2012,02,28,13,00,00)
-pLeague.gametime('south') <- time(2012,02,28,14,00,00)
+pLeague.stadium('access',B:[true],F:[20120228T080000..20120228T090000]) <- pLeague.players(T)
+pLeague.gametime('north') <- 20120228T130000
+pLeague.gametime('south') <- 20120228T140000
 pLeague.players('north') <- pJohn
 pLeague.players('south') <- pMark
@@ -17,5 +17,5 @@
 YAP query succeed
 pLeague.stadium('access',true,F:pLeague.gametime(T)) <- pLeague.players(T)
-pLeague.gametime('north') <- time(2012,02,28,13,00,00)
+pLeague.gametime('north') <- 20120228T130000
 pLeague.players('north') <- pJohn
 
@@ -25,4 +25,4 @@
 ===good============ league.stadium(access,true,20120128T080000)<-?-mark
 YAP query succeed
-pLeague.stadium('access',B:[true],F:[20120228T080000 .. 20120228T090000]) <- pLeague.players(T)
+pLeague.stadium('access',B:[true],F:[20120228T080000..20120228T090000]) <- pLeague.players(T)
 pLeague.players('south') <- pMark
Index: examples/python_tests/basic_id/id.save
===================================================================
--- examples/python_tests/basic_id/id.save	(revision e3462b4a59b42b4848b5ad88a611880e3200b047)
+++ examples/python_tests/basic_id/id.save	(revision 549656e28a22f7ee432c5e808a001b46b98f7b5b)
@@ -1,5 +1,5 @@
 % Restoring file /usr/local/lib/Yap/startup.yss
 python: Couldn't load ID/KEY IDKEY cert Tom_IDKEY.pem
-ABAC version 1.0
+ABAC version 2.1.0
 ...initial principal set...
 (pBob,keyid,y) 
Index: examples/python_tests/fruits_rt2/fruit.save
===================================================================
--- examples/python_tests/fruits_rt2/fruit.save	(revision e3462b4a59b42b4848b5ad88a611880e3200b047)
+++ examples/python_tests/fruits_rt2/fruit.save	(revision 549656e28a22f7ee432c5e808a001b46b98f7b5b)
@@ -1,4 +1,4 @@
 % Restoring file /usr/local/lib/Yap/startup.yss
-   
+
 ...final principal set...
 (pBob,keyid,y) 
@@ -11,15 +11,15 @@
 pRalphs.fruitprice(1.50) <- 'kiwi'
 pRalphs.fruitprice(0.50) <- 'navel orange'
-pBob.what2eat <- pRalphs.fruitprice(P:[1.000000 .. 5.000000])
-pMary.what2eat <- pRalphs.fruitprice(P:[.. 2.000000])
+pBob.what2eat <- pRalphs.fruitprice(P:[1.000000..5.000000])
+pMary.what2eat <- pRalphs.fruitprice(P:[..2.000000])
 
 ===good============ mary.what2eat <- navel orange
 YAP query succeed
-pMary.what2eat <- pRalphs.fruitprice(P:[.. 2.000000])
+pMary.what2eat <- pRalphs.fruitprice(P:[..2.000000])
 pRalphs.fruitprice(0.50) <- 'navel orange'
 
 ===good============ mary.what2eat <- kiwi
 YAP query succeed
-pMary.what2eat <- pRalphs.fruitprice(P:[.. 2.000000])
+pMary.what2eat <- pRalphs.fruitprice(P:[..2.000000])
 pRalphs.fruitprice(1.50) <- 'kiwi'
 
Index: examples/python_tests/payraise_rt1/pay.save
===================================================================
--- examples/python_tests/payraise_rt1/pay.save	(revision e3462b4a59b42b4848b5ad88a611880e3200b047)
+++ examples/python_tests/payraise_rt1/pay.save	(revision 549656e28a22f7ee432c5e808a001b46b98f7b5b)
@@ -22,5 +22,5 @@
 YAP query succeed
 pAlpha.payRaise <- pAlpha.evaluatorOf(This).goodPerformance & pAlpha.managerOf(This).niceCoworker
-pAlpha.evaluatorOf(pJoe) <- pBob
+pAlpha.evaluatorOf(pMaryann) <- pBob
 pBob.goodPerformance <- pMaryann
 pAlpha.managerOf(Z) <- pAlpha.evaluatorOf(Z)
Index: examples/python_tests/payraise_rt1/query.py
===================================================================
--- examples/python_tests/payraise_rt1/query.py	(revision e3462b4a59b42b4848b5ad88a611880e3200b047)
+++ examples/python_tests/payraise_rt1/query.py	(revision 549656e28a22f7ee432c5e808a001b46b98f7b5b)
@@ -76,2 +76,6 @@
     print "%s <- %s" % (c.head_string(), c.tail_string())
 
+
+##########################################################################
+#ctxt.dump_yap_db()
+
