Merge pull request #22 from geodynamics/baagaard/fix-python-2-3-compa…

…tibility

Small fixes for Python 2/3 compatibility

blade/pml/CodecPML.py

@@ -12,43 +12,37 @@
 #
 
 
-
 from pyre.odb.fs.CodecODB import CodecODB
 
 
 class CodecPML(CodecODB):
 
-
     def __init__(self):
         CodecODB.__init__(self, encoding='pml')
 
         from .Parser import Parser
         self._parser = Parser()
 
         self.parserFactory = None
-
-        return
 
+        return
 
     def _createRenderer(self):
         from .Renderer import Renderer
         return Renderer()
 
-
     def _decode(self, shelf):
         """lock and then read the contents of the file into the shelf"""
 
-        stream = file(shelf.name)
-
+        stream = open(shelf.name, "r")
         document = self._parser.parse(stream, self.parserFactory)
-
         shelf['blade'] = document
         shelf._frozen = True
-        
+
         return
 
 
 # version
 __id__ = "$Id: CodecPML.py,v 1.1.1.1 2005/03/08 16:13:56 aivazis Exp $"
 
-# End of file 
+# End of file

journal/components/File.py

@@ -12,7 +12,6 @@
 #
 
 
-
 from .Device import Device
 
 
@@ -26,7 +25,7 @@ class Inventory(Device.Inventory):
         name.meta['tip'] = "the name of the file in which messages will be placed"
 
     def createDevice(self):
-        logfile = file(self.inventory.name, "a", 0)
+        logfile = open(self.inventory.name, "a")
 
         import os
         import time

pyre/applications/Daemon.py

@@ -12,7 +12,6 @@
 #
 
 
-
 from .Stager import Stager
 
 
@@ -98,7 +97,7 @@ def daemon(self, pid, spawn=True):
 
     def configureJournal(self):
         # open the logfile
-        stream = file(self.name + '.log', "w")
+        stream = open(self.name + '.log', "w")
 
         # attach it as the journal device
         import journal

pyre/geometry/Loader.py

@@ -12,20 +12,17 @@
 #
 
 
-
 from .GeometricalModeller import GeometricalModeller
 
 
 class Loader(GeometricalModeller):
 
-
     class Inventory(GeometricalModeller.Inventory):
 
         import pyre.inventory
 
         source = pyre.inventory.str("source", default="sample.pml")
 
-
     def model(self):
         import os
 
@@ -38,10 +35,9 @@ def model(self):
         else:
             format = ext[1:]
 
-        stream = file(source)
-
-        return self.retrieveModel(stream, format)
+        stream = open(source, "r")
 
+        return self.retrieveModel(stream, format)
 
     def __init__(self, name=None):
         GeometricalModeller.__init__(self, name)
@@ -50,13 +46,12 @@ def __init__(self, name=None):
 
         return
 
-
     def _config(self):
         self.source = self.inventory.source
         return
-    
+
 
 # version
 __id__ = "$Id: Loader.py,v 1.1.1.1 2005/03/08 16:13:44 aivazis Exp $"
 
-# End of file 
+# End of file

pyre/idd/IDDService.py

@@ -12,27 +12,24 @@
 #
 
 
-
 from pyre.services.TCPService import TCPService
 
 
 class IDDService(TCPService):
 
-
     class Inventory(TCPService.Inventory):
 
         import pyre.idd
         import pyre.inventory
 
         tid = pyre.inventory.int('tid')
         date = pyre.inventory.str('date')
-        
+
         configfile = pyre.inventory.str("config", default=None)
 
         marshaller = pyre.inventory.facility("marshaller", factory=pyre.idd.pickler)
         locator = pyre.inventory.facility("recordLocator", factory=pyre.idd.recordLocator)
 
-
     def generateClientConfiguration(self, registry):
         """update the given registry node with sufficient information to grant access to clients"""
 
@@ -51,7 +48,6 @@ def generateClientConfiguration(self, registry):
 
         return
 
-
     def token(self):
         if self._reload:
             self.initialize()
@@ -68,18 +64,15 @@ def token(self):
 
         return token
 
-
     def onTimeout(self, *unused):
         self._info.log("thump")
         self.verify()
         return True
 
-
     def onReload(self, *unused):
         self._reload = True
         return
 
-
     def initialize(self, *unused):
         self._debug.log("reading '%s' state from %r" % (self.name, self.configfile))
         self._loadGeneratorParameters()
@@ -88,9 +81,8 @@ def initialize(self, *unused):
         self.verify()
 
         self._reload = False
-
-        return
 
+        return
 
     def verify(self):
         import time
@@ -109,7 +101,6 @@ def verify(self):
 
         return
 
-
     def __init__(self, name=None):
         if name is None:
             name = 'idd'
@@ -129,7 +120,6 @@ def __init__(self, name=None):
 
         return
 
-
     def _configure(self):
         TCPService._configure(self)
 
@@ -143,7 +133,6 @@ def _configure(self):
 
         return
 
-
     def _init(self):
         TCPService._init(self)
 
@@ -156,7 +145,6 @@ def _init(self):
 
         return
 
-
     def _loadGeneratorParameters(self):
         import os
         base, ext = os.path.splitext(self.configfile)
@@ -172,21 +160,19 @@ def _loadGeneratorParameters(self):
         # apply them
         self.updateConfiguration(mine)
         self.applyConfiguration()
-
-        return
 
+        return
 
     def _storeGeneratorParameters(self):
         self._debug.log("saving '%s' configuration in %r" % (self.name, self.configfile))
         registry = self._describe()
 
         if registry:
-            stream = file(self.configfile, "w")
+            stream = open(self.configfile, "w")
             text = self.weaver.weave(registry, stream)
             stream.close()
 
         return
-
 
     def _describe(self):
         import pyre.inventory
@@ -198,11 +184,11 @@ def _describe(self):
 
         # get the marshaller to save himself
         self.marshaller.retrieveConfiguration(mine)
-        
+
         return registry
 
 
 # version
 __id__ = "$Id: IDDService.py,v 1.7 2005/04/28 03:50:06 pyre Exp $"
 
-# End of file 
+# End of file

pyre/inventory/Inventory.py

@@ -407,7 +407,6 @@ def components(self, context=None):
             keys = iter(self._facilityRegistry.keys())
         else:
             keys = self._facilityOrder
-        #for name, facility in self._facilityRegistry.iteritems():
         for name in keys:
             facility = self._facilityRegistry[name]
             try:

pyre/inventory/pml/CodecPML.py

@@ -12,43 +12,39 @@
 #
 
 
-
 from pyre.odb.fs.CodecODB import CodecODB
 
 
 class CodecPML(CodecODB):
 
-
     def __init__(self):
         CodecODB.__init__(self, encoding='pml')
 
         from .Parser import Parser
         self._parser = Parser()
 
         self.parserFactory = None
-
-        return
 
+        return
 
     def _createRenderer(self):
         from .Renderer import Renderer
         return Renderer()
 
-
     def _decode(self, shelf):
         """lock and then read the contents of the file into the shelf"""
 
-        stream = file(shelf.name)
+        stream = open(shelf.name, "r")
 
         inventory = self._parser.parse(stream, self.parserFactory)
 
         shelf['inventory'] = inventory
         shelf._frozen = True
-        
+
         return
 
 
 # version
 __id__ = "$Id: CodecPML.py,v 1.1.1.1 2005/03/08 16:13:43 aivazis Exp $"
 
-# End of file 
+# End of file

pyre/inventory/properties/InputFile.py

@@ -18,24 +18,22 @@
 
 class InputFile(Property):
 
-
     def __init__(self, name, default=sys.stdin, meta=None, validator=None):
         Property.__init__(self, name, "file", default, meta, validator)
         return
 
-
     def _cast(self, value):
         if isinstance(value, basestring):
             if value == "stdin":
                 import sys
                 value = sys.stdin
             else:
-                value = file(value, "r")
-        
+                value = open(value, "r")
+
         return value
 
 
 # version
 __id__ = "$Id: InputFile.py,v 1.2 2005/03/11 06:09:32 aivazis Exp $"
 
-# End of file 
+# End of file

pyre/inventory/properties/OutputFile.py

@@ -18,12 +18,10 @@
 
 class OutputFile(Property):
 
-
     def __init__(self, name, default=sys.stdout, meta=None, validator=None):
         Property.__init__(self, name, "file", default, meta, validator)
         return
 
-
     def _cast(self, value):
         if isinstance(value, basestring):
             if value == "stdout":
@@ -33,12 +31,12 @@ def _cast(self, value):
                 import sys
                 value = sys.stderr
             else:
-                value = file(value, "w")
-        
+                value = open(value, "w")
+
         return value
 
 
 # version
 __id__ = "$Id: OutputFile.py,v 1.2 2005/03/11 06:09:39 aivazis Exp $"
 
-# End of file 
+# End of file