mailmanager 1.0.11 → 1.0.12

data/Changelog

@@ -1,4 +1,7 @@
-Current version is 1.0.11
+Current version is 1.0.12
+
+changes since 1.0.11
+- should now be compatible with Python 2.4+ (was 2.6+); 2.4 requires simplejson
 
 changes since 1.0.8
 - added more list metadata methods (see API docs)

data/Gemfile.lock

@@ -40,6 +40,8 @@ PLATFORMS
 
 DEPENDENCIES
   ZenTest (~> 4.4.2)
+  json (~> 1.4.6)
   mailmanager!
+  open4 (~> 1.0.1)
   rspec (~> 2.4.0)
   ruby-debug19

data/lib/mailmanager/listproxy.py

@@ -1,6 +1,16 @@
-import json
+try:
+  import json
+except ImportError:
+  import simplejson as json
 from email.Utils import parseaddr
-from collections import Callable
+try:
+  from collections import Callable
+except ImportError:
+  def iscallable(attr):
+    return callable(attr)
+else:
+  def iscallable(attr):
+    return isinstance(attr, Callable)
 from Mailman import MailList
 from Mailman import Errors
 
@@ -22,7 +32,7 @@ def userdesc_for(member):
 def unwindattrs(obj, attrs, *args):
     if not attrs.count('.'):
         attr = getattr(obj, attrs)
-        if isinstance(attr, Callable):
+        if iscallable(attr):
             return attr(*args)
         else:
             return attr
@@ -47,19 +57,19 @@ def command(mlist, cmd, *args):
             result['return'] = unwindattrs(mlist, cmd, *args)
         if needs_save.get(cmd.replace('.','_'), False):
             mlist.Save()
-    except TypeError as err:
+    except TypeError, err:
         error_msg = '%s' % err
         print json.dumps({'error': error_msg})
-    except AttributeError as err:
+    except AttributeError, err:
         error_msg = 'AttributeError: %s' % err
         print json.dumps({'error': error_msg})
-    except Errors.MMSubscribeNeedsConfirmation as err:
+    except Errors.MMSubscribeNeedsConfirmation, err:
         print json.dumps({'result': 'pending_confirmation'})
-    except Errors.MMAlreadyAMember as err:
+    except Errors.MMAlreadyAMember, err:
         print json.dumps({'result': 'already_a_member'})
-    except Errors.MMNeedApproval as err:
+    except Errors.MMNeedApproval, err:
         print json.dumps({'result': 'needs_approval'})
-    except Exception as err:
+    except Exception, err:
         error_msg = '%s: %s' % (type(err), err)
         print json.dumps({'error': error_msg})
     else:

data/lib/mailmanager/version.rb

@@ -1,3 +1,3 @@
 module MailManager
-  VERSION = '1.0.11'
+  VERSION = '1.0.12'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 11
-  version: 1.0.11
+  - 12
+  version: 1.0.12
 platform: ruby
 authors: 
 - Wes Morgan
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-25 00:00:00 -05:00
+date: 2011-01-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency