python3 - 2to3 + miscell obvious tweaks

[sfa.git] / sfa / storage / record.py

diff --git a/sfa/storage/record.py b/sfa/storage/record.py
index 8600723..ac391a1 100644 (file)
--- a/sfa/storage/record.py
+++ b/sfa/storage/record.py
@@ -1,10 +1,13 @@
+
+

 from sfa.util.sfatime import utcparse, datetime_to_string
 from sfa.util.sfatime import utcparse, datetime_to_string

-from types import StringTypes

 from datetime import datetime
 from sfa.util.xml import XML
 from sfa.trust.gid import GID
 
 from sfa.util.sfalogging import logger
 from datetime import datetime
 from sfa.util.xml import XML
 from sfa.trust.gid import GID
 
 from sfa.util.sfalogging import logger

+from sfa.util.py23 import StringType
+

 
 class Record:
 
 
 class Record:
 


@@ -14,7 +17,7 @@ class Record:
         elif xml_str:
             xml = XML(xml_str)
             xml_dict = xml.todict()
         elif xml_str:
             xml = XML(xml_str)
             xml_dict = xml.todict()

-            self.load_from_dict(xml_dict)  
+            self.load_from_dict(xml_dict)

 
     def get_field(self, field):
         return self.__dict__.get(field, None)
 
     def get_field(self, field):
         return self.__dict__.get(field, None)


@@ -23,53 +26,55 @@ class Record:
     # turns out the date_created field is received by the client as a 'created' int
     # (and 'last_updated' does not make it at all)
     # let's be flexible
     # turns out the date_created field is received by the client as a 'created' int
     # (and 'last_updated' does not make it at all)
     # let's be flexible

-    def date_repr (self,fields):
-        if not isinstance(fields,list):
+    def date_repr(self, fields):
+        if not isinstance(fields, list):

             fields = [fields]
         for field in fields:
             fields = [fields]
         for field in fields:

-            value = getattr(self,field,None)
-            if isinstance (value,datetime):
-                return datetime_to_string (value)
-            elif isinstance (value,(int,float)):
+            value = getattr(self, field, None)
+            if isinstance(value, datetime):
+                return datetime_to_string(value)
+            elif isinstance(value, (int, float)):

                 return datetime_to_string(utcparse(value))
         # fallback
         return "** undef_datetime **"
                 return datetime_to_string(utcparse(value))
         # fallback
         return "** undef_datetime **"

-    
+

     #
     # need to filter out results, esp. wrt relationships
     # exclude_types must be a tuple so we can use isinstance
     #
     # need to filter out results, esp. wrt relationships
     # exclude_types must be a tuple so we can use isinstance

-    # 
-    def record_to_dict (self, exclude_types=None):
+    #
+    def record_to_dict(self, exclude_types=None):

         if exclude_types is None:
             exclude_types = ()
         d = self.__dict__
         if exclude_types is None:
             exclude_types = ()
         d = self.__dict__

-        def exclude (k, v):
-            return k.startswith('_') or isinstance (v, exclude_types)
-        keys = [ k for k, v in d.items() if not exclude(k, v) ]
-        return { k : d[k] for k in keys }
-    
+
+        def exclude(k, v):
+            return k.startswith('_') or isinstance(v, exclude_types)
+        keys = [k for k, v in list(d.items()) if not exclude(k, v)]
+        return {k: d[k] for k in keys}
+

     def toxml(self):
         return self.save_as_xml()
 
     def toxml(self):
         return self.save_as_xml()
 

-    def load_from_dict (self, d):
-        for (k,v) in d.iteritems():
+    def load_from_dict(self, d):
+        for (k, v) in d.items():

             # experimental
             # experimental

-            if isinstance(v, StringTypes) and v.lower() in ['true']:
+            if isinstance(v, StringType) and v.lower() in ['true']:

                 v = True
                 v = True

-            if isinstance(v, StringTypes) and v.lower() in ['false']:
+            if isinstance(v, StringType) and v.lower() in ['false']:

                 v = False
             setattr(self, k, v)
 
     # in addition we provide convenience for converting to and from xml records
     # for this purpose only, we need the subclasses to define 'fields' as either
     # a list or a dictionary
                 v = False
             setattr(self, k, v)
 
     # in addition we provide convenience for converting to and from xml records
     # for this purpose only, we need the subclasses to define 'fields' as either
     # a list or a dictionary

-    def fields (self):
-        fields = self.__dict__.keys()
+    def fields(self):
+        fields = list(self.__dict__.keys())

         return fields
 
         return fields
 

-    def save_as_xml (self):
+    def save_as_xml(self):

         # xxx not sure about the scope here
         # xxx not sure about the scope here

-        input_dict = dict( [ (key, getattr(self,key)) for key in self.fields() if getattr(self,key,None) ] )
+        input_dict = dict([(key, getattr(self, key))
+                           for key in self.fields() if getattr(self, key, None)])

         xml_record = XML("<record />")
         xml_record.parse_dict(input_dict)
         return xml_record.toxml()
         xml_record = XML("<record />")
         xml_record.parse_dict(input_dict)
         return xml_record.toxml()


@@ -80,34 +85,37 @@ class Record:
         else:
             format = format.lower()
         if format == 'text':
         else:
             format = format.lower()
         if format == 'text':

-            self.dump_text(dump_parents,sort=sort)
+            self.dump_text(dump_parents, sort=sort)

         elif format == 'xml':
         elif format == 'xml':

-            print self.save_as_xml()
+            print(self.save_as_xml())

         elif format == 'simple':
         elif format == 'simple':

-            print self.dump_simple()
+            print(self.dump_simple())

         else:
         else:

-            raise Exception, "Invalid format %s" % format
+            raise Exception("Invalid format %s" % format)

 
     def dump_text(self, dump_parents=False, sort=False):
 
     def dump_text(self, dump_parents=False, sort=False):

-        print 40*'='
-        print "RECORD"
+        print(40 * '=')
+        print("RECORD")

         # print remaining fields
         fields = self.fields()
         # print remaining fields
         fields = self.fields()

-        if sort: fields.sort()
+        if sort:
+            fields.sort()

         for attrib_name in fields:
             attrib = getattr(self, attrib_name)
             # skip internals
         for attrib_name in fields:
             attrib = getattr(self, attrib_name)
             # skip internals

-            if attrib_name.startswith('_'):     continue
+            if attrib_name.startswith('_'):
+                continue

             # skip callables
             # skip callables

-            if callable (attrib):               continue
-            # handle gid 
+            if callable(attrib):
+                continue
+            # handle gid

             if attrib_name == 'gid':
             if attrib_name == 'gid':

-                print "    gid:"      
-                print GID(string=attrib).dump_string(8, dump_parents)
+                print("    gid:")
+                print(GID(string=attrib).dump_string(8, dump_parents))

             elif attrib_name in ['date created', 'last updated']:
             elif attrib_name in ['date created', 'last updated']:

-                print "    %s: %s" % (attrib_name, self.date_repr(attrib_name))
+                print("    %s: %s" % (attrib_name, self.date_repr(attrib_name)))

             else:
             else:

-                print "    %s: %s" % (attrib_name, attrib)
+                print("    %s: %s" % (attrib_name, attrib))

 
     def dump_simple(self):
 
     def dump_simple(self):

-        return "%s"%self    
+        return "%s" % self