deprecation fixes for julia 0.5

jump-dev · Jul 29, 2016 · 7e57d0c · 7e57d0c
1 parent a451e96
commit 7e57d0c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/src/JuMP.jl b/src/JuMP.jl
@@ -23,8 +23,6 @@ using Compat
 
 import Compat: UTF8String, view
 
-@compat import Base.show
-
 function __init__()
     ENABLE_NLP_RESOLVE[1] = false
 end

diff --git a/src/operators.jl b/src/operators.jl
@@ -325,6 +325,7 @@ Base.promote_rule(         ::Type{AffExpr}, ::Type{QuadExpr}) = QuadExpr
 Base.promote_rule{R<:Real}(::Type{QuadExpr},::Type{R}       ) = QuadExpr
 
 _throw_transpose_error() = error("Transpose not currently implemented for JuMPArrays with arbitrary index sets.")
+Base.transpose(x::AbstractJuMPScalar) = x
 Base.transpose( x::JuMPArray) = _throw_transpose_error()
 Base.ctranspose(x::JuMPArray) = _throw_transpose_error()
 

diff --git a/test/model.jl b/test/model.jl
@@ -76,7 +76,7 @@ facts("[model] Test printing a model") do
     # Test LP writer
     writeLP(modA, modPath * "A.lp")
     modALP = if VERSION >= v"0.5.0-dev+1866" # leading zero, base Julia PR #14377
-        ASCIIString[
+        String[
         "Maximize",
         "obj: 0.16666666666666666 VAR1 + 0.16666666666666666 VAR2 + 1 VAR3 + 1 VAR4",
         "Subject To",
@@ -96,7 +96,7 @@ facts("[model] Test printing a model") do
         "VAR2",
         "End"]
     else
-        ASCIIString[
+        String[
         "Maximize",
         "obj: .16666666666666666 VAR1 + .16666666666666666 VAR2 + 1 VAR3 + 1 VAR4",
         "Subject To",
@@ -128,7 +128,7 @@ facts("[model] Test printing a model") do
     # Test MPS writer
     writeMPS(modA, modPath * "A.mps")
     if VERSION >= v"0.5.0-dev+1866" # leading zero, base Julia PR #14377
-        modAMPS = ASCIIString[
+        modAMPS = String[
         "NAME   JuMPModel",
         "ROWS",
         " N  OBJ",
@@ -172,7 +172,7 @@ facts("[model] Test printing a model") do
         "  UP BOUND VAR7 6",
         "ENDATA"]
     else
-        modAMPS = ASCIIString[
+        modAMPS = String[
         "NAME   JuMPModel",
         "ROWS",
         " N  OBJ",
@@ -244,7 +244,7 @@ facts("[model] Quadratic MPS writer") do
     #####################################################################
     # Test MPS writer
     writeMPS(modQ, modPath * "Q.mps")
-    modQMPS = ASCIIString[
+    modQMPS = String[
     "NAME   JuMPModel",
     "ROWS",
     " N  OBJ",

diff --git a/test/print.jl b/test/print.jl
@@ -20,7 +20,7 @@ function io_test(mode, obj, exp_str; repl=:both)
         repl != :show  && @fact sprint(print, obj) --> exp_str
         repl != :print && @fact sprint(show,  obj) --> exp_str
     else
-        @fact sprint(writemime, "text/latex", obj) --> "\$\$ $exp_str \$\$"
+        @fact sprint(Compat.show, "text/latex", obj) --> "\$\$ $exp_str \$\$"
     end
 end