Merge branch 'master' of https://github.com/anthofflab/Mimi.jl

Author: davidanthoff

src/Mimi.jl

@@ -172,8 +172,8 @@ end
 # Return the MetaComponent for a given component
 function getmetainfo(m::Model, componentname::Symbol)
     meta = metainfo.getallcomps()
-    meta_module_name = Symbol(super(typeof(m.components[componentname])).name.module)
-    meta_component_name = Symbol(super(typeof(m.components[componentname])).name.name)
+    meta_module_name = Symbol(supertype(typeof(m.components[componentname])).name.module)
+    meta_component_name = Symbol(supertype(typeof(m.components[componentname])).name.name)
     meta[(meta_module_name, meta_component_name)]
 end
 
@@ -347,8 +347,8 @@ Return the values for variable `name` in `componentname` of model `m` as a DataF
 function getdataframe(m::Model, componentname::Symbol, name::Symbol)
     comp_type = typeof(m.components[componentname])
 
-    meta_module_name = Symbol(super(typeof(m.components[componentname])).name.module)
-    meta_component_name = Symbol(super(typeof(m.components[componentname])).name.name)
+    meta_module_name = Symbol(supertype(typeof(m.components[componentname])).name.module)
+    meta_component_name = Symbol(supertype(typeof(m.components[componentname])).name.name)
 
     vardiminfo = getdiminfoforvar((meta_module_name,meta_component_name), name)
     if length(vardiminfo)==0

test/test_dependencies.jl

@@ -1,5 +1,6 @@
 using Mimi
 using ZipFile
+using Compat
 
 function unzip(inputfilename, outputpath=pwd())
     r = ZipFile.Reader(inputfilename)
@@ -10,7 +11,7 @@ function unzip(inputfilename, outputpath=pwd())
                 mkpath(outpath)
             else
                 Base.open(outpath, "w") do io
-                    write(io, readall(f))
+                    write(io, readstring(f))
                 end
             end
         end