codegen: upgrade rabbitmq-codegen, improve compatibility with Python 3

Mako still has issues on 3.6, so we cannot switch to Python 3 by default :(

Author: michaelklishin

codegen/codegen.py

@@ -12,7 +12,7 @@
 try:
     from mako.template import Template
 except ImportError:
-    print "Mako isn't installed. Please install mako via pip or similar."
+    print("Mako isn't installed. Please install mako via pip or similar.")
     sys.exit(1)
 
 # main class
@@ -57,7 +57,7 @@ def new_init(self, arg):
 
 # method.accepted_by("server")
 # method.accepted_by("client", "server")
-accepted_by_update = json.loads(file("codegen/amqp_0.9.1_changes.json").read())
+accepted_by_update = json.loads(open("codegen/amqp_0.9.1_changes.json").read())
 
 def accepted_by(self, *receivers):
     def get_accepted_by(self):
@@ -143,7 +143,7 @@ def generateMain(type):
     def main(json_spec_path):
         spec = AmqpSpecObject(json_spec_path)
         spec.type = type
-        print render("codegen/protocol.rb.pytemplate", spec = spec)
+        print(render("codegen/protocol.rb.pytemplate", spec = spec))
 
     return main
 

codegen/codegen_helpers.py

@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 
+from __future__ import print_function
+
 def genSingleEncode(spec, cValue, unresolved_domain):
     buffer = []
     type = spec.resolveDomain(unresolved_domain)
@@ -24,7 +26,7 @@ def genSingleEncode(spec, cValue, unresolved_domain):
     elif type == 'table':
         buffer.append("buffer << AMQ::Protocol::Table.encode(%s)" % (cValue,))
     else:
-        raise "Illegal domain in genSingleEncode", type
+        raise "Illegal domain in genSingleEncode: {0}".format(type)
 
     return buffer
 
@@ -34,7 +36,7 @@ def genSingleDecode(spec, field):
 
     if cLvalue == "known_hosts":
         import sys
-        print >> sys.stderr, field, field.ignored
+        print(field, field.ignored, file = sys.stderr)
 
     type = spec.resolveDomain(unresolved_domain)
     buffer = []
@@ -70,7 +72,7 @@ def genSingleDecode(spec, field):
         buffer.append("%s = Table.decode(data[offset, table_length + 4])" % (cLvalue,))
         buffer.append("offset += table_length + 4")
     else:
-        raise StandardError("Illegal domain '" + type + "' in genSingleDecode")
+        raise StandardError("Illegal domain '{0}' in genSingleDecode".format(type))
 
     return buffer
 

codegen/rabbitmq-codegen

@@ -1,6 +1,10 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
+# rabbitmq-codegen is Python 3 compatible and so is
+# the code in this repo but Mako still fails with 3.6 as of May 2017 :( MK.
+python = ENV.fetch("PYTHON", "python2")
+
 def sh(*args)
   system(*args)
 end
@@ -13,8 +17,8 @@ def sh(*args)
 end
 
 path = "lib/amq/protocol/client.rb"
-puts "Running ./codegen/codegen.py client #{spec} #{path}"
-sh "./codegen/codegen.py client #{spec} #{extensions.join(' ')} #{path}"
+puts "Running '#{python} ./codegen/codegen.py client #{spec} #{extensions.join(' ')} #{path}'"
+sh "#{python} ./codegen/codegen.py client #{spec} #{extensions.join(' ')} #{path}"
 if File.file?(path)
   sh "ruby -c #{path}"
 end

generate.rb

@@ -251,7 +251,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'client_properties = nil', u"mechanism = u'PLAIN'", u'response = nil', u"locale = u'en_US'"]
+        # ['client_properties = nil', "mechanism = 'PLAIN'", 'response = nil', "locale = 'en_US'"]
         def self.encode(client_properties, mechanism, response, locale)
           channel = 0
           buffer = @packed_indexes.dup
@@ -307,7 +307,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'response = nil']
+        # ['response = nil']
         def self.encode(response)
           channel = 0
           buffer = @packed_indexes.dup
@@ -362,7 +362,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'channel_max = false', u'frame_max = false', u'heartbeat = false']
+        # ['channel_max = false', 'frame_max = false', 'heartbeat = false']
         def self.encode(channel_max, frame_max, heartbeat)
           channel = 0
           buffer = @packed_indexes.dup
@@ -386,7 +386,7 @@ def self.has_content?
         end
 
         # @return
-        # [u"virtual_host = u'/'", u'capabilities = EMPTY_STRING', u'insist = false']
+        # ["virtual_host = '/'", 'capabilities = EMPTY_STRING', 'insist = false']
         def self.encode(virtual_host)
           capabilities = EMPTY_STRING
           insist = false
@@ -467,7 +467,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'reply_code = nil', u'reply_text = EMPTY_STRING', u'class_id = nil', u'method_id = nil']
+        # ['reply_code = nil', 'reply_text = EMPTY_STRING', 'class_id = nil', 'method_id = nil']
         def self.encode(reply_code, reply_text, class_id, method_id)
           channel = 0
           buffer = @packed_indexes.dup
@@ -536,7 +536,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'reason = EMPTY_STRING']
+        # ['reason = EMPTY_STRING']
         def self.encode(reason)
           channel = 0
           buffer = @packed_indexes.dup
@@ -596,7 +596,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'out_of_band = EMPTY_STRING']
+        # ['out_of_band = EMPTY_STRING']
         def self.encode(channel, out_of_band)
           buffer = @packed_indexes.dup
           buffer << out_of_band.to_s.bytesize.chr
@@ -659,7 +659,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'active = nil']
+        # ['active = nil']
         def self.encode(channel, active)
           buffer = @packed_indexes.dup
           bit_buffer = 0
@@ -695,7 +695,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'active = nil']
+        # ['active = nil']
         def self.encode(channel, active)
           buffer = @packed_indexes.dup
           bit_buffer = 0
@@ -741,7 +741,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'reply_code = nil', u'reply_text = EMPTY_STRING', u'class_id = nil', u'method_id = nil']
+        # ['reply_code = nil', 'reply_text = EMPTY_STRING', 'class_id = nil', 'method_id = nil']
         def self.encode(channel, reply_code, reply_text, class_id, method_id)
           buffer = @packed_indexes.dup
           buffer << [reply_code].pack(PACK_UINT16)
@@ -802,7 +802,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'ticket = 0', u'exchange = nil', u"type = u'direct'", u'passive = false', u'durable = false', u'auto_delete = false', u'internal = false', u'nowait = false', u'arguments = {}']
+        # ['ticket = 0', 'exchange = nil', "type = 'direct'", 'passive = false', 'durable = false', 'auto_delete = false', 'internal = false', 'nowait = false', 'arguments = {}']
         def self.encode(channel, exchange, type, passive, durable, auto_delete, internal, nowait, arguments)
           ticket = 0
           buffer = @packed_indexes.dup
@@ -858,7 +858,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'ticket = 0', u'exchange = nil', u'if_unused = false', u'nowait = false']
+        # ['ticket = 0', 'exchange = nil', 'if_unused = false', 'nowait = false']
         def self.encode(channel, exchange, if_unused, nowait)
           ticket = 0
           buffer = @packed_indexes.dup
@@ -908,7 +908,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'ticket = 0', u'destination = nil', u'source = nil', u'routing_key = EMPTY_STRING', u'nowait = false', u'arguments = {}']
+        # ['ticket = 0', 'destination = nil', 'source = nil', 'routing_key = EMPTY_STRING', 'nowait = false', 'arguments = {}']
         def self.encode(channel, destination, source, routing_key, nowait, arguments)
           ticket = 0
           buffer = @packed_indexes.dup
@@ -962,7 +962,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'ticket = 0', u'destination = nil', u'source = nil', u'routing_key = EMPTY_STRING', u'nowait = false', u'arguments = {}']
+        # ['ticket = 0', 'destination = nil', 'source = nil', 'routing_key = EMPTY_STRING', 'nowait = false', 'arguments = {}']
         def self.encode(channel, destination, source, routing_key, nowait, arguments)
           ticket = 0
           buffer = @packed_indexes.dup
@@ -1024,7 +1024,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'ticket = 0', u'queue = EMPTY_STRING', u'passive = false', u'durable = false', u'exclusive = false', u'auto_delete = false', u'nowait = false', u'arguments = {}']
+        # ['ticket = 0', 'queue = EMPTY_STRING', 'passive = false', 'durable = false', 'exclusive = false', 'auto_delete = false', 'nowait = false', 'arguments = {}']
         def self.encode(channel, queue, passive, durable, exclusive, auto_delete, nowait, arguments)
           ticket = 0
           buffer = @packed_indexes.dup
@@ -1090,7 +1090,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'ticket = 0', u'queue = EMPTY_STRING', u'exchange = nil', u'routing_key = EMPTY_STRING', u'nowait = false', u'arguments = {}']
+        # ['ticket = 0', 'queue = EMPTY_STRING', 'exchange = nil', 'routing_key = EMPTY_STRING', 'nowait = false', 'arguments = {}']
         def self.encode(channel, queue, exchange, routing_key, nowait, arguments)
           ticket = 0
           buffer = @packed_indexes.dup
@@ -1144,7 +1144,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'ticket = 0', u'queue = EMPTY_STRING', u'nowait = false']
+        # ['ticket = 0', 'queue = EMPTY_STRING', 'nowait = false']
         def self.encode(channel, queue, nowait)
           ticket = 0
           buffer = @packed_indexes.dup
@@ -1197,7 +1197,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'ticket = 0', u'queue = EMPTY_STRING', u'if_unused = false', u'if_empty = false', u'nowait = false']
+        # ['ticket = 0', 'queue = EMPTY_STRING', 'if_unused = false', 'if_empty = false', 'nowait = false']
         def self.encode(channel, queue, if_unused, if_empty, nowait)
           ticket = 0
           buffer = @packed_indexes.dup
@@ -1252,7 +1252,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'ticket = 0', u'queue = EMPTY_STRING', u'exchange = nil', u'routing_key = EMPTY_STRING', u'arguments = {}']
+        # ['ticket = 0', 'queue = EMPTY_STRING', 'exchange = nil', 'routing_key = EMPTY_STRING', 'arguments = {}']
         def self.encode(channel, queue, exchange, routing_key, arguments)
           ticket = 0
           buffer = @packed_indexes.dup
@@ -1540,7 +1540,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'prefetch_size = false', u'prefetch_count = false', u'global = false']
+        # ['prefetch_size = false', 'prefetch_count = false', 'global = false']
         def self.encode(channel, prefetch_size, prefetch_count, global)
           buffer = @packed_indexes.dup
           buffer << [prefetch_size].pack(PACK_UINT32)
@@ -1587,7 +1587,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'ticket = 0', u'queue = EMPTY_STRING', u'consumer_tag = EMPTY_STRING', u'no_local = false', u'no_ack = false', u'exclusive = false', u'nowait = false', u'arguments = {}']
+        # ['ticket = 0', 'queue = EMPTY_STRING', 'consumer_tag = EMPTY_STRING', 'no_local = false', 'no_ack = false', 'exclusive = false', 'nowait = false', 'arguments = {}']
         def self.encode(channel, queue, consumer_tag, no_local, no_ack, exclusive, nowait, arguments)
           ticket = 0
           buffer = @packed_indexes.dup
@@ -1666,7 +1666,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'consumer_tag = nil', u'nowait = false']
+        # ['consumer_tag = nil', 'nowait = false']
         def self.encode(channel, consumer_tag, nowait)
           buffer = @packed_indexes.dup
           buffer << consumer_tag.to_s.bytesize.chr
@@ -1719,7 +1719,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'ticket = 0', u'exchange = EMPTY_STRING', u'routing_key = EMPTY_STRING', u'mandatory = false', u'immediate = false', 'user_headers = nil', 'payload = ""', 'frame_size = nil']
+        # ['ticket = 0', 'exchange = EMPTY_STRING', 'routing_key = EMPTY_STRING', 'mandatory = false', 'immediate = false', 'user_headers = nil', 'payload = ""', 'frame_size = nil']
         def self.encode(channel, payload, user_headers, exchange, routing_key, mandatory, immediate, frame_size)
           ticket = 0
           buffer = @packed_indexes.dup
@@ -1843,7 +1843,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'ticket = 0', u'queue = EMPTY_STRING', u'no_ack = false']
+        # ['ticket = 0', 'queue = EMPTY_STRING', 'no_ack = false']
         def self.encode(channel, queue, no_ack)
           ticket = 0
           buffer = @packed_indexes.dup
@@ -1957,7 +1957,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'delivery_tag = false', u'multiple = false']
+        # ['delivery_tag = false', 'multiple = false']
         def self.encode(channel, delivery_tag, multiple)
           buffer = @packed_indexes.dup
           buffer << AMQ::Pack.pack_uint64_big_endian(delivery_tag)
@@ -1981,7 +1981,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'delivery_tag = nil', u'requeue = true']
+        # ['delivery_tag = nil', 'requeue = true']
         def self.encode(channel, delivery_tag, requeue)
           buffer = @packed_indexes.dup
           buffer << AMQ::Pack.pack_uint64_big_endian(delivery_tag)
@@ -2005,7 +2005,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'requeue = false']
+        # ['requeue = false']
         def self.encode(channel, requeue)
           buffer = @packed_indexes.dup
           bit_buffer = 0
@@ -2028,7 +2028,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'requeue = false']
+        # ['requeue = false']
         def self.encode(channel, requeue)
           buffer = @packed_indexes.dup
           bit_buffer = 0
@@ -2091,7 +2091,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'delivery_tag = false', u'multiple = false', u'requeue = true']
+        # ['delivery_tag = false', 'multiple = false', 'requeue = true']
         def self.encode(channel, delivery_tag, multiple, requeue)
           buffer = @packed_indexes.dup
           buffer << AMQ::Pack.pack_uint64_big_endian(delivery_tag)
@@ -2271,7 +2271,7 @@ def self.has_content?
         end
 
         # @return
-        # [u'nowait = false']
+        # ['nowait = false']
         def self.encode(channel, nowait)
           buffer = @packed_indexes.dup
           bit_buffer = 0