[System] minor refractoring

Author: alquerci

__init__.py

@@ -14,7 +14,7 @@
 from pymfony.component.system.oop import abstract;
 from pymfony.component.system.oop import interface;
 
-if sys.version_info[0] == 2:
+if sys.version_info < (3,):
     from pymfony.component.system.py2 import *;
 else:
     from pymfony.component.system.py3 import *;
@@ -166,7 +166,7 @@ def __init__(self, instanceOrig):
                                 setattr(self, name, cloneMethod);
                             else:
                                 setattr(self, name, value);
-                        except AttributeError:
+                        except Exception:
                             pass;
 
                 for classType in instance.__class__.__mro__:
@@ -251,7 +251,7 @@ def isAbstract(cls, obj):
 
     @classmethod
     def isCallable(cls, closure):
-        if isinstance(closure, AbstractString):
+        if isinstance(closure, basestring):
             if '.' in closure:
                 # Static class method call
                 try:
@@ -269,7 +269,7 @@ def isCallable(cls, closure):
             if len(closure) != 2:
                 return False;
 
-            if not isinstance(closure[1], AbstractString):
+            if not isinstance(closure[1], basestring):
                 return False;
 
             if not isinstance(closure[0], object):
@@ -376,7 +376,7 @@ def stripcslashes(cls, string):
 
 class ReflectionClass(Object):
     def __init__(self, argument):
-        if isinstance(argument, AbstractString):
+        if isinstance(argument, basestring):
             qualClassName = argument;
             try:
                 argument = ClassLoader.load(argument);

exception.py

@@ -70,7 +70,10 @@ def __createTrace(self):
             name = f.f_code.co_name;
             argcount = f.f_code.co_argcount;
             allLines = linecache.getlines(filename, f.f_globals);
-            line = allLines[lineno - 1].strip();
+            if allLines:
+                line = allLines[lineno - 1].strip();
+            else:
+                line = "";
 
             upAndDown = 5;
 

json.py

@@ -10,9 +10,7 @@
 
 import sys;
 
-if sys.version_info <= (2, 6):
-    from pymfony.component.system.py26.json import *;
-elif sys.version_info < (3, 0):
+if sys.version_info < (3,):
     from pymfony.component.system.py2.json import *;
 else:
     from pymfony.component.system.py3.json import *;

py2/__init__.py

@@ -20,7 +20,6 @@
 
 __all__ = [
     'OOPObject',
-    'AbstractString',
     'AbstractCloneBuilder',
 ];
 
@@ -38,13 +37,6 @@ def __subclasshook__(cls, subclass):
 class OOPObject(object, Abstract):
     __metaclass__ = OOPMeta;
 
-class AbstractString(str, OOPObject):
-    @classmethod
-    def __subclasshook__(cls, subclass):
-        if issubclass(subclass, basestring):
-            return True;
-        return NotImplemented;
-
 class AbstractCloneBuilder(OOPObject):
     TYPES_MAP = {
         'int': int,

py2/json.py

@@ -8,8 +8,7 @@
 
 from __future__ import absolute_import;
 
-from json import decoder;
-from collections import OrderedDict;
+import sys
 
 """
 """
@@ -18,10 +17,18 @@
     'AbstractJSONDecoderOrderedDict',
 ];
 
-class AbstractJSONDecoderOrderedDict(decoder.JSONDecoder):
-    def __init__(self, parse_float=None, parse_int=None, parse_constant=None,
-                       strict=True):
-        decoder.JSONDecoder.__init__(self, object_hook=None, parse_float=parse_float, parse_int=parse_int, parse_constant=parse_constant, strict=strict, object_pairs_hook=self.__object_pairs_hook);
+if sys.version_info <= (2, 6):
+    from pymfony.component.system.py2.minor6.json import AbstractJSONDecoderOrderedDict;
+else:
+    from json import JSONDecoder;
+    from pymfony.component.system.types import OrderedDict
 
-    def __object_pairs_hook(self, seq):
-        return OrderedDict(seq);
+    class AbstractJSONDecoderOrderedDict(JSONDecoder):
+        def __init__(self, parse_float=None, parse_int=None,
+            parse_constant=None, strict=True):
+            JSONDecoder.__init__(self, object_hook=None, parse_float=parse_float,
+                parse_int=parse_int, parse_constant=parse_constant,
+                strict=strict, object_pairs_hook=self.__object_pairs_hook);
+
+        def __object_pairs_hook(self, seq):
+            return OrderedDict(seq);

py26/__init__.py renamed to py2/minor6/__init__.py

@@ -11,7 +11,7 @@
 from json import decoder;
 from json import scanner;
 
-from pymfony.component.system.py26.types import OrderedDict;
+from pymfony.component.system.types import OrderedDict;
 
 """
 """

py26/json.py renamed to py2/minor6/json.py

@@ -1,4 +1,23 @@
 # -*- coding: utf-8 -*-
+# This file is part of the pymfony package.
+#
+# (c) Alexandre Quercia <[email protected]>
+#
+# For the full copyright and license information, please view the LICENSE
+# file that was distributed with this source code.
+
+from __future__ import absolute_import;
+
+from UserDict import DictMixin;
+
+"""
+"""
+
+__all__ = [
+    'AbstractOrderedDict',
+];
+
+class AbstractOrderedDict(dict, DictMixin):
 # Copyright (c) 2009 Raymond Hettinger
 #
 # Permission is hereby granted, free of charge, to any person
@@ -20,11 +39,6 @@
 #     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 #     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 #     OTHER DEALINGS IN THE SOFTWARE.
-
-from UserDict import DictMixin
-
-class OrderedDict(dict, DictMixin):
-
     def __init__(self, *args, **kwds):
         if len(args) > 1:
             raise TypeError('expected at most 1 arguments, got %d' % len(args))

py26/types.py renamed to py2/minor6/types.py

@@ -1,128 +1,33 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2009 Raymond Hettinger
+# This file is part of the pymfony package.
 #
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
+# (c) Alexandre Quercia <[email protected]>
 #
-#     The above copyright notice and this permission notice shall be
-#     included in all copies or substantial portions of the Software.
-#
-#     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-#     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-#     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-#     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-#     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-#     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-#     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-#     OTHER DEALINGS IN THE SOFTWARE.
-
-from UserDict import DictMixin
-
-class OrderedDict(dict, DictMixin):
-
-    def __init__(self, *args, **kwds):
-        if len(args) > 1:
-            raise TypeError('expected at most 1 arguments, got %d' % len(args))
-        try:
-            self.__end
-        except AttributeError:
-            self.clear()
-        self.update(*args, **kwds)
-
-    def clear(self):
-        self.__end = end = []
-        end += [None, end, end]         # sentinel node for doubly linked list
-        self.__map = {}                 # key --> [key, prev, next]
-        dict.clear(self)
-
-    def __setitem__(self, key, value):
-        if key not in self:
-            end = self.__end
-            curr = end[1]
-            curr[2] = end[1] = self.__map[key] = [key, curr, end]
-        dict.__setitem__(self, key, value)
+# For the full copyright and license information, please view the LICENSE
+# file that was distributed with this source code.
 
-    def __delitem__(self, key):
-        dict.__delitem__(self, key)
-        key, prev, end = self.__map.pop(key)
-        prev[2] = end
-        end[1] = prev
+from __future__ import absolute_import;
 
-    def __iter__(self):
-        end = self.__end
-        curr = end[2]
-        while curr is not end:
-            yield curr[0]
-            curr = curr[2]
+import sys;
 
-    def __reversed__(self):
-        end = self.__end
-        curr = end[1]
-        while curr is not end:
-            yield curr[0]
-            curr = curr[1]
+from pymfony.component.system import Object;
 
-    def popitem(self, last=True):
-        if not self:
-            raise KeyError('dictionary is empty')
-        if last:
-            key = reversed(self).next()
-        else:
-            key = iter(self).next()
-        value = self.pop(key)
-        return key, value
+if sys.version_info <= (2, 6):
+    from pymfony.component.system.py2.minor6.types import AbstractOrderedDict;
+else:
+    from collections import OrderedDict as AbstractOrderedDict;
 
-    def __reduce__(self):
-        items = [[k, self[k]] for k in self]
-        tmp = self.__map, self.__end
-        del self.__map, self.__end
-        inst_dict = vars(self).copy()
-        self.__map, self.__end = tmp
-        if inst_dict:
-            return (self.__class__, (items,), inst_dict)
-        return self.__class__, (items,)
+"""
+"""
 
-    def keys(self):
-        return list(self)
-
-    setdefault = DictMixin.setdefault
-    update = DictMixin.update
-    pop = DictMixin.pop
-    values = DictMixin.values
-    items = DictMixin.items
-    iterkeys = DictMixin.iterkeys
-    itervalues = DictMixin.itervalues
-    iteritems = DictMixin.iteritems
-
-    def __repr__(self):
-        if not self:
-            return '%s()' % (self.__class__.__name__,)
-        return '%s(%r)' % (self.__class__.__name__, self.items())
-
-    def copy(self):
-        return self.__class__(self)
+__all__ = [
+    'AbstractString',
+    'AbstractOrderedDict',
+];
 
+class AbstractString(str, Object):
     @classmethod
-    def fromkeys(cls, iterable, value=None):
-        d = cls()
-        for key in iterable:
-            d[key] = value
-        return d
-
-    def __eq__(self, other):
-        if isinstance(other, OrderedDict):
-            if len(self) != len(other):
-                return False
-            for p, q in  zip(self.items(), other.items()):
-                if p != q:
-                    return False
-            return True
-        return dict.__eq__(self, other)
-
-    def __ne__(self, other):
-        return not self == other
+    def __subclasshook__(cls, subclass):
+        if issubclass(subclass, basestring):
+            return True;
+        return NotImplemented;

py2/types.py

@@ -16,10 +16,12 @@
 
 __all__ = [
     'OOPObject',
-    'AbstractString',
+    'basestring',
     'AbstractCloneBuilder',
 ];
 
+basestring = str;
+
 class Abstract():
     __abstractclass__ = None;
     __isfinalclass__ = False;
@@ -33,13 +35,6 @@ def __subclasshook__(cls, subclass):
 class OOPObject(Abstract, metaclass=OOPMeta):
     pass;
 
-class AbstractString(str, OOPObject):
-    @classmethod
-    def __subclasshook__(cls, subclass):
-        if issubclass(subclass, str):
-            return True;
-        return NotImplemented;
-
 class AbstractCloneBuilder(OOPObject):
     TYPES_MAP = {
         'int': int,
@@ -56,4 +51,3 @@ class AbstractCloneBuilder(OOPObject):
         'dict': dict,
         'bool': bool,
     };
-