Changeset 364

Timestamp:

12/25/06 16:33:22

Author:

fumanchu

Message:

Changed UnitSequencerNull? to UnitSequencer?, and made the other UnitSequencers? inherit from it just for fun.

Files:

• trunk/doc/modeling.html (modified) (1 diff)
• trunk/schemas.py (modified) (1 diff)
• trunk/storage/db.py (modified) (2 diffs)
• trunk/test/zoo_fixture.py (modified) (5 diffs)
• trunk/units.py (modified) (5 diffs)

trunk/doc/modeling.html

@@ -343 +343 @@
-UnitSequencerInteger in this way.]</p>
-
-<tt>UnitSequencerNull</tt>, which simply
-
-
-Null
+the base class <tt>UnitSequencer</tt>,
+
+<tt>ClassA.ID</tt> 
+
-in your own code.</p>
-

trunk/schemas.py

@@ -11 +11 @@
-    ID = units.UnitProperty(unicode)
-    Version = units.UnitProperty(int)
-Null
+
-
-

trunk/storage/db.py

@@ -658 +658 @@
-        
-        class AutoUnitClass(dejavu.Unit):
-Null
+
-            identifiers = tuple([k for k in table.columns
-                                 if table.columns[k].key])
@@ -740 +740 @@
-                code.append(sequencer)
-        else:
-Null
+
-        
-        if len(code) == 1:

trunk/test/zoo_fixture.py

@@ -3 +3 @@
-import datetime
-import os
+thisdir = os.path.dirname(__file__)
+logname = os.path.join(thisdir, "djvtest.log")
+
+
-try:
-    import pythoncom
@@ -146 +150 @@
-    # Remove the ID property (inherited from Unit) from the Exhibit class.
-    ID = None
-Null
+
-    identifiers = ("ZooID", Name)
-
@@ -1009 +1013 @@
-            self.fail("Exhibit incorrectly possesses an ID property.")
-        
-Null
+
-        
-        if not ("    identifiers = ('ZooID', 'Name')" in source
@@ -1179 +1183 @@
-        message = message.encode('utf8')
-    s = "%s %s" % (datetime.datetime.now().isoformat(), message)
-
-
+
-    f.write(s + '\n')
-    f.close()
@@ -1271 +1274 @@
-    finally:
-        teardown()
-

trunk/units.py

@@ -18 +18 @@
-__all__ = ['UnitAssociation', 'ToMany', 'ToOne', 'UnitJoin',
-           'Unit', 'UnitProperty', 'TriggerProperty', 'MetaUnit',
-Null
+
-           'UnitSequencerUnicode',
-##           '_define_fixedpoint_states', '_fix_fixedpoint_cmp',
@@ -213 +213 @@
-# obey the builtin max() and min() functions.
-
-Null
-null sequencer for Unit identifi
+
+base class for Unit identifier Sequenc
-    
-    In many cases, identifier values simply have no algorithmic sequence;
@@ -229 +229 @@
-    
-    def valid_id(self, identity):
+        """If the given identity value is syntactically valid, return True.
+        
+        Note that this method makes no other assertions about the given
+        identity; in particular, it does not check for duplicated values.
+        """
-        for val in identity:
-            if val is None:
@@ -235 +240 @@
-    
-    def assign(self, unit, sequence):
+        """Set a valid identifier on the given unit.
+        
+        The given sequence may be used to determine the 'next' valid id.
+        If provided, it should be the entire set of existing identifiers.
+        """
-        raise StopIteration("No sequence defined.")
-
-
-object
+UnitSequencer
-    """A sequencer for Unit identifiers, where id[i+1] == id[i] + 1."""
-    
@@ -257 +267 @@
-
-
-
-
-
-
+
+
-    
-    def __init__(self, type=unicode, width=6,