Merge branch 'amqp' of vapour:ocamlmsg into amqp

amqp_codegen.py

@@ -37,7 +37,6 @@ copyright_stmt = '''(* Copyright 2012 Tony Garnock-Jones <tonygarnockjones@gmail
 
 import sys
 import xml.dom.minidom
-from collections import namedtuple
 
 ###########################################################################
 # XML utils
@@ -114,27 +113,39 @@ class DatalikeMixin:
     def match_clause(self):
         return '  | ' + self.pattern() + ' ->'
 
-class Class(DatalikeMixin,
+class Class(DatalikeMixin):
-            namedtuple('Class', 'index name fields methods'.split())):
+    def __init__(self, index, name, fields, methods):
+        self.index = index
+        self.name = name
+        self.fields = fields
+        self.methods = methods
+
     @property
     def full_name(self):
         return self.name + '-properties'
 
-class Method(DatalikeMixin,
+class Method(DatalikeMixin):
-             namedtuple('Method', ['class_name',
+    def __init__(self, class_name, class_index, has_content, deprecated,
-                                   'class_index',
+                 index, name, synchronous, responses, fields):
-                                   'has_content',
+        self.class_name = class_name
-                                   'deprecated',
+        self.class_index = class_index
-                                   'index',
+        self.has_content = has_content
-                                   'name',
+        self.deprecated = deprecated
-                                   'synchronous',
+        self.index = index
-                                   'responses',
+        self.name = name
-                                   'fields'])):
+        self.synchronous = synchronous
+        self.responses = responses
+        self.fields = fields
+
     @property
     def full_name(self):
         return self.class_name + '-' + self.name
 
-Field = namedtuple('Field', 'name type reserved'.split())
+class Field:
+    def __init__(self, name, type, reserved):
+        self.name = name
+        self.type = type
+        self.reserved = reserved
 
 def load_fields(e):
     return [Field(attr(f, 'name'),

codegen.py

@@ -18,7 +18,10 @@
 from __future__ import with_statement
 
 import sys
-import json
+try:
+    import json
+except:
+    import simplejson as json
 
 def mlify(s):
     s = s.replace('-', '_')