Improve Python-3 compatibility

* Use `TFL.Meta.BaM`, not class variable `__metaclass__`

* Syntax :

  + Print function, not statement

  + Raise syntax

  + Except syntax

* Iterator changes

* unicode vs. str

* Use `portable_repr`

Author: tanzer

_CNDB/_GTW/RST_addons.py

@@ -3,7 +3,7 @@
 # Glasauergasse 32, A--1130 Wien, Austria. [email protected]
 # #*** <License> ************************************************************#
 # This module is part of the package CNDB.GTW.
-# 
+#
 # This module is licensed under the terms of the BSD 3-Clause License
 # <http://www.c-tanzer.at/license/bsd_3c.html>.
 # #*** </License> ***********************************************************#
@@ -172,7 +172,7 @@ def bindings (self) :
 
     @Once_Property
     def head (self) :
-        return unicode (self)
+        return pyk.text_type (self)
     # end def head
 
 # end class Node_Manager_Error

_CNDB/_OMP/Attr_Type.py

@@ -3,7 +3,7 @@
 # Glasauergasse 32, A--1130 Wien, Austria. [email protected]
 # #*** <License> ************************************************************#
 # This module is part of the package CNDB.OMP.
-# 
+#
 # This module is licensed under the terms of the BSD 3-Clause License
 # <http://www.c-tanzer.at/license/bsd_3c.html>.
 # #*** </License> ***********************************************************#
@@ -38,19 +38,22 @@
 #    ««revision-date»»···
 #--
 
-from   __future__  import absolute_import, division, print_function, unicode_literals
-
-from   math                     import log
+from   __future__               import absolute_import, division
+from   __future__               import print_function, unicode_literals
 
+from   _CNDB                    import CNDB
 from   _MOM.import_MOM          import *
 from   _MOM.import_MOM          import _A_Unit_, _A_Float_, _A_Named_Value_
-from   _CNDB                    import CNDB
-import _CNDB._OMP
-from   _TFL.I18N                import _
-from _MOM._Attr.Number_Interval import A_Int_Interval_C
 
 import _CNDB._OMP.Wireless_Mode
 
+from   _MOM._Attr.Number_Interval import A_Int_Interval_C
+
+from   _TFL.I18N                import _
+from   _TFL.pyk                 import pyk
+
+from   math                     import log
+
 class A_Polarization (_A_Named_Value_) :
     """Antenna polarisation"""
 
@@ -203,7 +206,7 @@ class _Attributes :
 
 # end class A_IP6_Netmask_Interval
 
-__all__ = tuple (k for (k, v) in globals ().iteritems () if is_attr_type (v))
+__all__ = tuple (k for (k, v) in pyk.iteritems (globals ()) if is_attr_type (v))
 
 if __name__ != "__main__" :
     CNDB.OMP._Export ("*")

_CNDB/_OMP/IP_Network.py

@@ -3,7 +3,7 @@
 # Reichergasse 131, A--3411 Weidling, Austria. [email protected]
 # #*** <License> ************************************************************#
 # This module is part of the package CNDB.OMP.
-# 
+#
 # This module is licensed under the terms of the BSD 3-Clause License
 # <http://www.c-tanzer.at/license/bsd_3c.html>.
 # #*** </License> ***********************************************************#
@@ -258,8 +258,8 @@ class owner_or_expiration (Pred.Condition) :
     def allocate (self, mask_len, owner) :
         # FIXME: Don't allocate if self is electric
         #        We need this when checking permissions on pools
-        frm     = self.find_closest_mask   (mask_len)
-        net_addr = frm.net_address.subnets (mask_len).next ()
+        frm      = self.find_closest_mask (mask_len)
+        net_addr = next (frm.net_address.subnets (mask_len))
         return self._reserve (self, frm, net_addr, owner)
     # end def allocate
 

_CNDB/_OMP/Wireless_Mode.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2012 Mag. Christian Tanzer All rights reserved
+# Copyright (C) 2012-2014 Mag. Christian Tanzer All rights reserved
 # Glasauergasse 32, A--1130 Wien, Austria. [email protected]
 # #*** <License> ************************************************************#
 # This module is part of the package CNDB.OMP.
-# 
+#
 # This module is licensed under the terms of the BSD 3-Clause License
 # <http://www.c-tanzer.at/license/bsd_3c.html>.
 # #*** </License> ***********************************************************#
@@ -30,6 +30,7 @@
 from   _TFL                     import TFL
 
 from   _TFL.I18N                import _, _T, _Tn
+from   _TFL.pyk                 import pyk
 
 import _TFL._Meta.Object
 
@@ -49,17 +50,18 @@ def __str__ (cls) :
     # end def __str__
 
     def _m_add (cls, name, Table) :
-        name = unicode (name)
+        name = pyk.text_type (name)
         assert name not in Table, "Name clash: `%s` <-> `%s`" % \
             (name, Table [name].__class__)
         Table [name] = cls
     # end def _m_add
 
 # end class M_Wireless_Mode
 
-class Wireless_Mode (TFL.Meta.Object) :
+class Wireless_Mode \
+          (TFL.Meta.BaM (TFL.Meta.Object, metaclass = M_Wireless_Mode)) :
 
-    __metaclass__ = M_Wireless_Mode
+    pass
 
 # end class Wireless_Mode
 

_CNDB/_OMP/__test__/Antenna.py

@@ -3,7 +3,7 @@
 # Glasauergasse 32, A--1130 Wien, Austria. [email protected]
 # #*** <License> ************************************************************#
 # This module is part of the package CNDB.OMP.__test__.
-# 
+#
 # This module is licensed under the terms of the BSD 3-Clause License
 # <http://www.c-tanzer.at/license/bsd_3c.html>.
 # #*** </License> ***********************************************************#
@@ -62,11 +62,10 @@
     ...     , polarization = "horizontal"
     ...     , raw          = True
     ...     )
-    >>> scope.commit ()
-    Traceback (most recent call last):
-      ...
+    >>> with expect_except (MOM.Error.Invariants) :
+    ...     scope.commit ()
     Invariants: Condition `band_exists` : There must be at least one frequency band for the antenna. (number_of_bands >= 1)
-        bands = ()
+        bands =
         number_of_bands = 0 << len (bands)
 
     >>> args = dict (left = at1, azimuth = "180", elevation_angle = 0, raw = True)
@@ -92,11 +91,11 @@
 
     >>> akw = dict (polarization = "horizontal")
     >>> CNDB.Antenna.query_s (* CNDB.Antenna.raw_query_attrs (akw, akw)).all ()
-    [CNDB.Antenna ((u'yagi1', u'', u''), u'3'), CNDB.Antenna ((u'yagi2', u'', u''), u'4'), CNDB.Antenna ((u'yagi2', u'', u''), u'6')]
+    [CNDB.Antenna (('yagi1', '', ''), '3'), CNDB.Antenna (('yagi2', '', ''), '4'), CNDB.Antenna (('yagi2', '', ''), '6')]
 
     >>> akw = dict (polarization = "vertical")
     >>> CNDB.Antenna.query_s (* CNDB.Antenna.raw_query_attrs (akw, akw)).all ()
-    [CNDB.Antenna ((u'yagi1', u'', u''), u'1'), CNDB.Antenna ((u'yagi1', u'', u''), u'2')]
+    [CNDB.Antenna (('yagi1', '', ''), '1'), CNDB.Antenna (('yagi1', '', ''), '2')]
 
     >>> mgr = PAP.Person \\
     ...     (first_name = 'Ralf', last_name = 'Schlatterbeck', raw = True)
@@ -121,7 +120,7 @@
     True
 
     >>> b.my_node
-    CNDB.Node (u'nogps')
+    CNDB.Node ('nogps')
 
     >>> CNDB.Antenna.query (Q.interface == wl).count ()
     1
@@ -134,37 +133,37 @@
 
     >>> for x in scope.CNDB.Net_Interface.query (Q.my_node.manager == mgr, sort_key = Q.pid) :
     ...     x
-    CNDB.Wireless_Interface (((u'generic', u'', u''), (u'nogps', ), u'dev'), u'', u'wl')
+    CNDB.Wireless_Interface ((('generic', '', ''), ('nogps', ), 'dev'), '', 'wl')
 
     >>> for x in scope.CNDB.Wireless_Interface_uses_Antenna.query (Q.my_node.manager == mgr, sort_key = Q.pid) :
     ...     x
-    CNDB.Wireless_Interface_uses_Antenna ((((u'generic', u'', u''), (u'nogps', ), u'dev'), u'', u'wl'), ((u'yagi2', u'', u''), u'6'))
+    CNDB.Wireless_Interface_uses_Antenna (((('generic', '', ''), ('nogps', ), 'dev'), '', 'wl'), (('yagi2', '', ''), '6'))
 
     >>> for x in scope.CNDB.Net_Device.query (Q.my_node.manager == mgr, sort_key = Q.pid) :
     ...     x
-    CNDB.Net_Device ((u'generic', u'', u''), (u'nogps', ), u'dev')
-    CNDB.Net_Device ((u'generic', u'', u''), (u'node2', ), u'dev2')
+    CNDB.Net_Device (('generic', '', ''), ('nogps', ), 'dev')
+    CNDB.Net_Device (('generic', '', ''), ('node2', ), 'dev2')
 
     >>> for x in scope.CNDB.Net_Device.query (Q.my_node.owner == owner, sort_key = Q.pid) :
     ...     x
-    CNDB.Net_Device ((u'generic', u'', u''), (u'node2', ), u'dev2')
+    CNDB.Net_Device (('generic', '', ''), ('node2', ), 'dev2')
 
     >>> for x in scope.CNDB.Antenna.query (Q.my_node.manager == mgr, sort_key = Q.pid) :
     ...     x
-    CNDB.Antenna ((u'yagi2', u'', u''), u'6')
+    CNDB.Antenna (('yagi2', '', ''), '6')
 
     >>> for x in scope.CNDB.Node.query (Q.manager == mgr, sort_key = Q.pid) :
     ...     x
-    CNDB.Node (u'nogps')
-    CNDB.Node (u'node2')
+    CNDB.Node ('nogps')
+    CNDB.Node ('node2')
 
     >>> for x in scope.CNDB.Node.query (Q.owner == mgr, sort_key = Q.pid) :
     ...     x
-    CNDB.Node (u'nogps')
+    CNDB.Node ('nogps')
 
     >>> for x in scope.CNDB.Node.query (Q.owner == owner, sort_key = Q.pid) :
     ...     x
-    CNDB.Node (u'node2')
+    CNDB.Node ('node2')
 
 """
 

_CNDB/_OMP/__test__/IP_Network.py

@@ -3,7 +3,7 @@
 # Glasauergasse 32, A--1130 Wien, Austria. [email protected]
 # #*** <License> ************************************************************#
 # This module is part of the package CNDB.OMP.__test__.
-# 
+#
 # This module is licensed under the terms of the BSD 3-Clause License
 # <http://www.c-tanzer.at/license/bsd_3c.html>.
 # #*** </License> ***********************************************************#
@@ -457,7 +457,7 @@
     ...     , Q.ip_pool.cool_down_period != None
     ...     , sort_key = TFL.Sorted_By ("ip_pool.cool_down_period")
     ...     ).distinct ().all ()
-    [CNDB.IP4_Network_in_IP4_Pool (("10.0.0.0/28", ), (u'rs_pool', )), CNDB.IP4_Network_in_IP4_Pool (("10.0.0.0/8", ), (u'ff_pool', ))]
+    [CNDB.IP4_Network_in_IP4_Pool (("10.0.0.0/28", ), ('rs_pool', )), CNDB.IP4_Network_in_IP4_Pool (("10.0.0.0/8", ), ('ff_pool', ))]
 
     >>> IPP_ETM = rs_pool.home_scope [rs_pool.ETM.ip_pool.P_Type]
     >>> IPP_ETM
@@ -472,14 +472,14 @@
     ...     , Q.ip_pool.cool_down_period != None
     ...     , sort_key = TFL.Sorted_By ("ip_pool.cool_down_period")
     ...     ).first ()
-    CNDB.IP4_Network_in_IP4_Pool (("10.0.0.0/28", ), (u'rs_pool', ))
+    CNDB.IP4_Network_in_IP4_Pool (("10.0.0.0/28", ), ('rs_pool', ))
 
     >>> CNDB.IP4_Network_in_IP4_Pool.query \\
     ...     ( Q.ip_network.net_address.CONTAINS (rs_pool.net_address)
     ...     , Q.ip_pool.cool_down_period != None
     ...     , sort_key = TFL.Sorted_By ("ip_pool.cool_down_period")
     ...     ).distinct ().all ()
-    [CNDB.IP4_Network_in_IP4_Pool (("10.0.0.0/28", ), (u'rs_pool', )), CNDB.IP4_Network_in_IP4_Pool (("10.0.0.0/8", ), (u'ff_pool', ))]
+    [CNDB.IP4_Network_in_IP4_Pool (("10.0.0.0/28", ), ('rs_pool', )), CNDB.IP4_Network_in_IP4_Pool (("10.0.0.0/8", ), ('ff_pool', ))]
 
     >>> CNDB.IP4_Network_in_IP4_Pool.query \\
     ...     ( Q.ip_network.net_address.CONTAINS (rs_pool.net_address)
@@ -856,10 +856,10 @@
     >>> id2 = CNDB.Net_Interface_in_IP_Network  (wd, a4, mask_len = 24)
 
     >>> il2
-    CNDB.Wireless_Interface_in_IP4_Network ((((u'g', u'', u''), (u'nogps', ), u'dev'), u'', u'wl'), ("10.0.0.1", ))
+    CNDB.Wireless_Interface_in_IP4_Network (((('g', '', ''), ('nogps', ), 'dev'), '', 'wl'), ("10.0.0.1", ))
 
     >>> id2
-    CNDB.Wired_Interface_in_IP4_Network ((((u'g', u'', u''), (u'nogps', ), u'dev'), u'', u'wd'), ("10.0.0.1", ))
+    CNDB.Wired_Interface_in_IP4_Network (((('g', '', ''), ('nogps', ), 'dev'), '', 'wd'), ("10.0.0.1", ))
 
 """
 

_CNDB/_OMP/__test__/Nodes.py

@@ -3,7 +3,7 @@
 # Glasauergasse 32, A--1130 Wien, Austria. [email protected]
 # #*** <License> ************************************************************#
 # This module is part of the package CNDB.OMP.__test__.
-# 
+#
 # This module is licensed under the terms of the BSD 3-Clause License
 # <http://www.c-tanzer.at/license/bsd_3c.html>.
 # #*** </License> ***********************************************************#
@@ -73,7 +73,7 @@
     ...     )
     >>> node1.address = adr
     >>> node1.address
-    PAP.Address (u'example 23', u'1010', u'wien', u'austria')
+    PAP.Address ('example 23', '1010', 'wien', 'austria')
 
     >>> gps2 = dict (lat = "48.367088", lon = "16.187672")
     >>> node3 = CNDB.Node \\
@@ -107,9 +107,8 @@
     >>> ir2 = CNDB.Net_Interface_in_IP4_Network (wr, a3, mask_len = 24)
     >>> il2 = CNDB.Net_Interface_in_IP4_Network (wl, a4, mask_len = 24)
 
-    >>> irx = CNDB.Net_Interface_in_IP4_Network (wr, ax, mask_len = 22) # doctest:+ELLIPSIS
-    Traceback (most recent call last):
-      ...
+    >>> with expect_except (MOM.Error.Invariants) :
+    ...     irx = CNDB.Net_Interface_in_IP4_Network (wr, ax, mask_len = 22) # doctest:+ELLIPSIS
     Invariants: Condition `valid_mask_len` : The `mask_len` must match the one of `right` or of any
     network containing `right`. (mask_len in possible_mask_lens)
         mask_len = 22
@@ -120,9 +119,8 @@
     >>> net2 = CNDB.IP4_Network (net_address = '10.0.0.0/8', owner = mgr, raw = True)
     >>> a2_1 = net2.reserve (Adr ('10.139.187.0/27'))
     >>> a2_2 = net2.reserve (Adr ('10.139.187.2'))
-    >>> a2_f = net2.reserve (Adr ('10.139.187.0/27'))
-    Traceback (most recent call last):
-      ...
+    >>> with expect_except (CNDB.OMP.Error.Address_Already_Used) :
+    ...     a2_f = net2.reserve (Adr ('10.139.187.0/27'))
     Address_Already_Used: Address 10.139.187.0/27 already in use by 'Schlatterbeck Ralf'
 
     >>> at1 = CNDB.Antenna_Type \\
@@ -259,11 +257,10 @@
 
     >>> node1 = CNDB.Node (name = "nogps", manager = mgr, position = None, raw = True)
     >>> node1.owner
-    PAP.Person (u'schlatterbeck', u'ralf', u'', u'')
+    PAP.Person ('schlatterbeck', 'ralf', '', '')
 
-    >>> node4 = CNDB.Node (name = "node4", manager = mgr, owner = node1)
-    Traceback (most recent call last):
-      ...
+    >>> with expect_except (MOM.Error.Wrong_Type) :
+    ...     node4 = CNDB.Node (name = "node4", manager = mgr, owner = node1)
     Wrong_Type: Node 'nogps' not eligible for attribute owner,
         must be instance of Subject
 

_CNDB/_OMP/__test__/RST.py

@@ -3,7 +3,7 @@
 # Glasauergasse 32, A--1130 Wien, Austria. [email protected]
 # #*** <License> ************************************************************#
 # This module is part of the package CNDB.OMP.__test__.
-# 
+#
 # This module is licensed under the terms of the BSD 3-Clause License
 # <http://www.c-tanzer.at/license/bsd_3c.html>.
 # #*** </License> ***********************************************************#
@@ -81,8 +81,8 @@ def fixtures (self, scope) :
 
     >>> CC = GTW.RST.MOM.Client.Requester (R.prefix, verify = False)
     >>> r = CC.get ("")
-    >>> r._url
-    u'http://localhost:9999/'
+    >>> prepr (r._url)
+    'http://localhost:9999/'
 
     >>> r = show (R.get ("/v1/CNDB-Node"))
     { 'json' :