-

cool-RR · cool-RR · commit e662c3716d17 · 2015-06-15T23:17:55.000+03:00
diff --git a/docs/topics/caching/cached_type.txt b/docs/topics/caching/cached_type.txt
@@ -19,8 +19,7 @@ preventing more than one of them from being created:
 
    >>> from python_toolbox import caching
    >>>
-   >>> class A(object):
-   ...      __metaclass__ = caching.CachedType
+   >>> class A(metaclass=caching.CachedType):
    ...      def __init__(self, a=1, b=2):
    ...          self.a = a
    ...          self.b = b
diff --git a/source_py3/python_toolbox/wx_tools/event_tools.py b/source_py3/python_toolbox/wx_tools/event_tools.py
@@ -58,5 +58,5 @@ def navigate_from_key_event(key_event):
         return False
             
 
-class ObjectWithId(object):
+class ObjectWithId:
     Id = caching.CachedProperty(lambda object: wx.NewId())
diff --git a/source_py3/python_toolbox/wx_tools/keyboard/key.py b/source_py3/python_toolbox/wx_tools/keyboard/key.py
@@ -4,7 +4,7 @@
 import wx
 
 
-class Key(object):
+class Key:
     '''A key combination.'''
 
     def __init__(self, key_code, cmd=False, alt=False, shift=False):
diff --git a/source_py3/python_toolbox/wx_tools/timing/cute_base_timer.py b/source_py3/python_toolbox/wx_tools/timing/cute_base_timer.py
@@ -2,7 +2,7 @@
 # This program is distributed under the MIT license.
 
 
-class CuteBaseTimer(object):
+class CuteBaseTimer:
     '''A base class for timers, allowing easy central stopping.'''    
     __timers = [] # todo: change to weakref list
     
diff --git a/source_py3/python_toolbox/wx_tools/widgets/cute_dialog.py b/source_py3/python_toolbox/wx_tools/widgets/cute_dialog.py
@@ -13,7 +13,7 @@
 from .cute_dialog_type import CuteDialogType
 
 
-class CuteDialog(wx.Dialog, CuteTopLevelWindow):
+class CuteDialog(wx.Dialog, CuteTopLevelWindow, metaclass=CuteDialogType):
     '''
     An improved `wx.Dialog`.
     
@@ -27,8 +27,6 @@ class CuteDialog(wx.Dialog, CuteTopLevelWindow):
     
     '''
     
-    __metaclass__ = CuteDialogType
-    
     
     def __init__(self, *args, **kwargs):
         if not kwargs.pop('skip_wx_init', False):
diff --git a/source_py3/python_toolbox/wx_tools/widgets/cute_window/bind_savvy_evt_handler/bind_savvy_evt_handler.py b/source_py3/python_toolbox/wx_tools/widgets/cute_window/bind_savvy_evt_handler/bind_savvy_evt_handler.py
@@ -10,7 +10,7 @@
 from . import name_parser
 
 
-class BindSavvyEvtHandler(wx.EvtHandler):
+class BindSavvyEvtHandler(wx.EvtHandler, metaclass=BindSavvyEvtHandlerType):
     '''
     Event handler type that allows binding events automatically by method name.
     
@@ -20,8 +20,6 @@ class BindSavvyEvtHandler(wx.EvtHandler):
     of `BindSavvyEvtHandlerType`'s methods and attributes for more details.
     '''
     
-    __metaclass__ = BindSavvyEvtHandlerType
-    
     
     _BindSavvyEvtHandlerType__name_parser = name_parser.NameParser(
         (name_parser.LowerCase,),
diff --git a/source_py3/python_toolbox/wx_tools/widgets/cute_window/bind_savvy_evt_handler/name_parser.py b/source_py3/python_toolbox/wx_tools/widgets/cute_window/bind_savvy_evt_handler/name_parser.py
@@ -21,9 +21,8 @@ class CaseStyleType(abc.ABCMeta):
     '''
 
 
-class BaseCaseStyle(object):
+class BaseCaseStyle(metaclass=CaseStyleType):
     '''Base class for case styles.'''
-    __metaclass__ = CaseStyleType
     
     @abc_tools.AbstractStaticMethod
     def parse(name):
@@ -74,7 +73,7 @@ def parse(name):
         return words
 
 
-class NameParser(object):
+class NameParser:
     '''
     Parser that parses an event handler name.
     
diff --git a/source_py3/python_toolbox/wx_tools/widgets/knob/snap_map.py b/source_py3/python_toolbox/wx_tools/widgets/knob/snap_map.py
@@ -19,7 +19,7 @@
 '''
 
 
-class SnapMap(object):
+class SnapMap:
     '''
     Map for deciding which angle the knob will have when mouse-dragging.
     
diff --git a/source_py3/python_toolbox/wx_tools/window_tools.py b/source_py3/python_toolbox/wx_tools/window_tools.py
@@ -23,7 +23,7 @@ def thaw_handler(self):
         self.window.Thaw()
 		
 		
-class FlagRaiser(object): # todo: rename?
+class FlagRaiser: # todo: rename?
     '''When called, raises a flag of a window and then calls some function.'''
     def __init__(self, window, attribute_name=None, function=None, delay=None):
         '''
