python3

__init__.py

@@ -9,7 +9,7 @@
 from flask import Blueprint, render_template, request
 from modules.core.props import Property
 
-from pyowfs import Connection
+from .pyowfs import Connection
 
 blueprint = Blueprint('one_wire_owfs', __name__)
 

pyowfs/__init__.py

@@ -30,7 +30,7 @@
 #    ««revision-date»»···
 #--
 
-from owfs import Connection
+from .owfs import Connection
 
 ### __END__ __init__
 

pyowfs/libcapi.py

@@ -57,7 +57,7 @@ def emit (self, record) :
 
 CACHE_MAX_AGE = 30 # seconds
 
-class AlreadyInitialisedError (StandardError) :
+class AlreadyInitialisedError (Exception) :
     pass
 # end class AlreadyInitialisedError
 

pyowfs/owfs.py

@@ -37,7 +37,7 @@
 #                      when searching a sensor by it's 1wire id
 #    ««revision-date»»···
 #--
-import libcapi
+from . import libcapi
 import re
 import logging
 
@@ -124,7 +124,7 @@ def put (self, key, value) :
 
         This resembles a write access to self.path/key.
         """
-        if self.has_key (key) and not isinstance (self.get (key), Dir) :
+        if key in self and not isinstance (self.get (key), Dir) :
             val = str (value)
             return self.capi.put ("%s%s" % (self.path, key), val)
     # end def put
@@ -194,8 +194,8 @@ def find (self, **kw) :
                     continue
 
             failed = False
-            for k, v in kw.iteritems () :
-                if not sensor.has_key (k) :
+            for k, v in kw.items () :
+                if k not in sensor :
                     failed = True
                 elif sensor.get (k, cached = cached) != v :
                     failed = True