svn commit: r908216 - /subversion/trunk/subversion/bindings/swig/include/proxy.swg

[rd...@apache.org]

Author: rdonch
Date: Tue Feb  9 21:03:03 2010
New Revision: 908216

URL: http://svn.apache.org/viewvc?rev=908216&view=rev
Log:
* subversion/bindings/swig/include/proxy.swg: Following up on r908153, drop
   the ABC shenanigans completely. They're not worth the trouble in this case.


Modified:
    subversion/trunk/subversion/bindings/swig/include/proxy.swg

Modified: subversion/trunk/subversion/bindings/swig/include/proxy.swg
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/include/proxy.swg?rev=908216&r1=908215&r2=908216&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/include/proxy.swg (original)
+++ subversion/trunk/subversion/bindings/swig/include/proxy.swg Tue Feb  9 21:03:03 2010
@@ -30,24 +30,13 @@
  */
  
 %pythoncode %{
-  import sys
-
-  # Abstract Base Classes aren't available until 2.6
-  if sys.version_info >= (2, 6):
-    import collections
-    _sequence_type = collections.Sequence
-    _mapping_type = collections.Mapping
-  else:
-    _sequence_type = list
-    _mapping_type = dict
-
   def _copy_metadata(value, old_value):
     if value is None or old_value is None or value is old_value: return
     
-    if isinstance(value, _mapping_type):
+    if isinstance(value, dict):
       for (k, v) in value:
         _copy_metadata(v, old_value[k])
-    elif isinstance(value, _sequence_type):
+    elif isinstance(value, list):
       for v, old_v in zip(value, old_value):
         _copy_metadata(v, old_v)
     else: