Merge pull request faif#161 from duboviy/master

Add six library usage for cross-version compatibility; Resolve issue faif#117

Author: faif

.travis.yml

@@ -18,7 +18,7 @@ cache:
 
 install:
  - travis_retry pip install -q coveralls codecov
- - pip install flake8 # eventually worth
+ - pip install flake8 six # eventually worth
 
 script:
 # Run tests

flyweight.py

@@ -5,29 +5,31 @@
 
 importweakref
 
+fromsiximportadd_metaclass
+
 
 classFlyweightMeta(type):
+
 def__new__(mcs, name, parents, dct):
 """
+ Set up object pool
 
  :param name: class name
  :param parents: class parents
  :param dct: dict: includes class attributes, class methods,
  static methods, etc
  :return: new class
  """
-
-# set up instances pool
 dct['pool'] =weakref.WeakValueDictionary()
 returnsuper(FlyweightMeta, mcs).__new__(mcs, name, parents, dct)
 
 @staticmethod
 def_serialize_params(cls, *args, **kwargs):
-"""Serialize input parameters to a key.
+"""
+ Serialize input parameters to a key.
  Simple implementation is just to serialize it as a string
-
  """
-args_list=map(str, args)
+args_list=list(map(str, args))
 args_list.extend([str(kwargs), cls.__name__])
 key=''.join(args_list)
 returnkey
@@ -65,20 +67,15 @@ def __repr__(self):
 return"<Card: %s%s>"% (self.value, self.suit)
 
 
+@add_metaclass(FlyweightMeta)
 classCard2(object):
-__metaclass__=FlyweightMeta
 
 def__init__(self, *args, **kwargs):
 # print('Init{}:{}'.format(self.__class__, (args, kwargs)))
 pass
 
 
 if__name__=='__main__':
-importsys
-ifsys.version_info[0] >2:
-sys.stderr.write("!!! This example is compatible only with Python 2 ATM !!!\n")
-raiseSystemExit(0)
-
 # comment __new__ and uncomment __init__ to see the difference
 c1=Card('9', 'h')
 c2=Card('9', 'h')