0
@@ -1,3 +1,7 @@
0
+class Module
0
+  def to_pickle; self.name.to_pickle end
0
+end
0
+
0
 class NilClass
0
   def to_pickle; "N" end
0
 end

0
@@ -2,6 +2,8 @@ class Pyasm
0
   CO_NEWLOCALS = 0x02
0
   CO_NOFREE = 0x40
0
 
0
+  VM_CALL_FCALL_BIT = 0x08
0
+
0
   OPS = {
0
     :== => 2
0
   }
0
@@ -11,7 +13,7 @@ class Pyasm
0
   def initialize(fname, type = nil, name = "<module>", lineno = 0)
0
     @argc, @nlocals, @stacksize, @flags, @filename, @lineno, @name, @stack, @nopop, @type = 
0
       0, 0, 1, CO_NOFREE, fname, lineno, name, [], 0, type
0
-    @flags |= CO_NEWLOCALS if type == :class
0
+    @flags |= CO_NEWLOCALS if [:class, :method].include?(type)
0
     @consts = [-1, nil]
0
     @symbols = [:Kernel]
0
     @bytecode, @varsyms, @labels, @lines, @jumps = [], [], {}, [], {}
0
@@ -200,7 +202,7 @@ class Pyasm
0
       bytes = @bytecode.slice! idx..-1
0
 
0
       unless receiver
0
-        unpop
0
+        unpop 
0
         case meth
0
         when :import
0
           return import(*args)
0
@@ -220,7 +222,9 @@ class Pyasm
0
       bytes = @bytecode.slice! idx..-1
0
     end
0
 
0
-    load_attr(meth)
0
+    if meth != :new
0
+      load_attr(meth)
0
+    end
0
     @bytecode += bytes
0
     call_func(op_argc)
0
   end
0
@@ -228,7 +232,7 @@ class Pyasm
0
     @nopop = 2
0
   end
0
   def pop
0
-    pop_top unless @nopop > 0
0
+    pop_top unless @nopop > 0 or @stack.empty?
0
   end
0
   def opt_eq arg
0
     compare_op :==
0
@@ -277,7 +281,7 @@ class Pyasm
0
     store_name(id)
0
 
0
     # this is a bit redundant, but decompyle requires it
0
-    if type == :method
0
+    if type == :method and @type == nil
0
       unless receiver
0
         load_name(id)
0
         load_name(:Kernel)