Switch to new style class declaration

Also fixed imports and docs.

Author: Arie

behavioral/catalog.py

@@ -8,10 +8,9 @@
 __gist__ = "<https://gist.github.com/diopib/7679559>"
 
 
-class Catalog():
+class Catalog(object):
+    """catalog of multiple static methods that are executed depending on an init
 
-    """
-    catalog of multiple static methods that are executed depending on an init
     parameter
     """
 
@@ -38,18 +37,18 @@ def _static_method_2():
         print("executed method 2!")
 
     def main_method(self):
-        """
-        will execute either _static_method_1 or _static_method_2
+        """will execute either _static_method_1 or _static_method_2
+
         depending on self.param value
         """
         self._static_method_choices[self.param]()
 
 
 # Alternative implementation for different levels of methods
-class CatalogInstance:
+class CatalogInstance(object):
+
+    """catalog of multiple methods that are executed depending on an init
 
-    """
-    catalog of multiple methods that are executed depending on an init
     parameter
     """
 
@@ -72,17 +71,17 @@ def _instance_method_2(self):
                                 'param_value_2': _instance_method_2}
 
     def main_method(self):
-        """
-        will execute either _instance_method_1 or _instance_method_2
+        """will execute either _instance_method_1 or _instance_method_2
+
         depending on self.param value
         """
         self._instance_method_choices[self.param].__get__(self)()
 
 
-class CatalogClass:
+class CatalogClass(object):
+
+    """catalog of multiple class methods that are executed depending on an init
 
-    """
-    catalog of multiple class methods that are executed depending on an init
     parameter
     """
 
@@ -108,17 +107,17 @@ def _class_method_2(cls):
                              'param_value_2': _class_method_2}
 
     def main_method(self):
-        """
-        will execute either _class_method_1 or _class_method_2
+        """will execute either _class_method_1 or _class_method_2
+
         depending on self.param value
         """
         self._class_method_choices[self.param].__get__(None, self.__class__)()
 
 
-class CatalogStatic:
+class CatalogStatic(object):
+
+    """catalog of multiple static methods that are executed depending on an init
 
-    """
-    catalog of multiple static methods that are executed depending on an init
     parameter
     """
 
@@ -141,8 +140,8 @@ def _static_method_2():
                               'param_value_2': _static_method_2}
 
     def main_method(self):
-        """
-        will execute either _static_method_1 or _static_method_2
+        """will execute either _static_method_1 or _static_method_2
+
         depending on self.param value
         """
         self._static_method_choices[self.param].__get__(None, self.__class__)()

behavioral/chain.py

@@ -2,14 +2,14 @@
 # -*- coding: utf-8 -*-
 """http://www.dabeaz.com/coroutines/"""
 
-import time
+from contextlib import contextmanager
 import os
 import sys
-from contextlib import contextmanager
+import time
+
 
+class Handler(object):
 
-class Handler:
-    
     def __init__(self, successor=None):
         self._successor = successor
 
@@ -53,7 +53,7 @@ def _handle(self, request):
         return True
 
 
-class Client:
+class Client(object):
 
     def __init__(self):
         self.handler = ConcreteHandler1(

behavioral/memento.py

@@ -2,7 +2,8 @@
 # -*- coding: utf-8 -*-
 """http://code.activestate.com/recipes/413838-memento-closure/"""
 
-from copy import copy, deepcopy
+from copy import copy
+from copy import deepcopy
 
 
 def memento(obj, deep=False):
@@ -15,8 +16,9 @@ def restore():
     return restore
 
 
-class Transaction:
+class Transaction(object):
     """A transaction guard.
+
     This is, in fact, just syntactic sugar around a memento closure.
     """
     deep = False
@@ -37,6 +39,7 @@ def rollback(self):
 
 class Transactional(object):
     """Adds transactional semantics to methods. Methods decorated  with
+
     @Transactional will rollback to entry-state upon exceptions.
     """
 

behavioral/registry.py

@@ -20,7 +20,7 @@ def get_registry(cls):
         return dict(cls.REGISTRY)
 
 
-class BaseRegisteredClass:
+class BaseRegisteredClass(object):
     __metaclass__ = RegistryHolder
     """
         Any class that will inherits from BaseRegisteredClass will be included

creational/abstract_factory.py

@@ -8,7 +8,7 @@
 import random
 
 
-class PetShop:
+class PetShop(object):
 
     """A pet shop"""
 
@@ -28,7 +28,7 @@ def show_pet(self):
 
 # Stuff that our factory makes
 
-class Dog:
+class Dog(object):
 
     def speak(self):
         return "woof"
@@ -37,7 +37,7 @@ def __str__(self):
         return "Dog"
 
 
-class Cat:
+class Cat(object):
 
     def speak(self):
         return "meow"
@@ -48,7 +48,7 @@ def __str__(self):
 
 # Factory classes
 
-class DogFactory:
+class DogFactory(object):
 
     def get_pet(self):
         return Dog()
@@ -57,7 +57,7 @@ def get_food(self):
         return "dog food"
 
 
-class CatFactory:
+class CatFactory(object):
 
     def get_pet(self):
         return Cat()

creational/borg.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 
-class Borg:
+class Borg(object):
     __shared_state = {}
 
     def __init__(self):

creational/factory_method.py

@@ -4,7 +4,7 @@
 """http://ginstrom.com/scribbles/2007/10/08/design-patterns-python-style/"""
 
 
-class GreekGetter:
+class GreekGetter(object):
 
     """A simple localizer a la gettext"""
 
@@ -16,7 +16,7 @@ def get(self, msgid):
         return self.trans.get(msgid, str(msgid))
 
 
-class EnglishGetter:
+class EnglishGetter(object):
 
     """Simply echoes the msg ids"""
 

creational/pool.py

@@ -6,7 +6,7 @@
 """
 
 
-class QueueObject():
+class QueueObject(object):
 
     def __init__(self, queue, auto_get=False):
         self._queue = queue

creational/prototype.py

@@ -4,7 +4,7 @@
 import copy
 
 
-class Prototype:
+class Prototype(object):
 
     value = 'default'
 
@@ -15,7 +15,7 @@ def clone(self, **attrs):
         return obj
 
 
-class PrototypeDispatcher:
+class PrototypeDispatcher(object):
 
     def __init__(self):
         self._objects = {}