Merge 1fd9fa6 into cd6e9b5

JuliaPy · Oct 15, 2014 · 6bd48b5 · 6bd48b5
2 parents cd6e9b5 + 1fd9fa6
commit 6bd48b5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/REQUIRE b/REQUIRE
@@ -1 +1,2 @@
 julia 0.2-
+Compat
diff --git a/src/PyCall.jl b/src/PyCall.jl
@@ -20,6 +20,10 @@ import Base: size, ndims, similar, copy, getindex, setindex!, stride,
 # similar long-running (or potentially long-running) code.
 import Base: sigatomic_begin, sigatomic_end
 
+## Compatibility import for v0.3, v0.4
+
+import Compat
+
 #########################################################################
 
 # Mirror of C PyObject struct (for non-debugging Python builds).  

diff --git a/src/gui.jl b/src/gui.jl
@@ -124,7 +124,7 @@ function wx_eventloop(sec::Real=50e-3)
 end
 
 # cache running event loops (so that we don't start any more than once)
-const eventloops = (Symbol=>Timer)[]
+const eventloops = Dict{Symbol,Timer}()
 
 function pygui_start(gui::Symbol=pygui(), sec::Real=50e-3)
     pygui(gui)

diff --git a/src/numpy.jl b/src/numpy.jl
@@ -166,14 +166,14 @@ npy_type(::Type{PyPtr}) = NPY_OBJECT
 typealias NPY_TYPES Union(Bool,Int8,Uint8,Int16,Uint16,Int32,Uint32,Int64,Uint64,Float32,Float64,Complex64,Complex128,PyPtr)
 
 # conversions from __array_interface__ type strings to supported Julia types
-const npy_typestrs = (String=>Type)[ "b1"=>Bool,
-                                     "i1"=>Int8, "u1"=>Uint8,
-                                     "i2"=>Int16, "u2"=>Uint16,
-                                     "i4"=>Int32, "u4"=>Uint32,
-                                     "i8"=>Int64, "u8"=>Uint64,
-                                     "f4"=>Float32, "f8"=>Float64,
-                                     "c8"=>Complex64, "c16"=>Complex128,
-                                     "O$(div(WORD_SIZE,8))"=>PyPtr ]
+const npy_typestrs = @Compat.Dict( "b1"=>Bool,
+                                   "i1"=>Int8,      "u1"=>Uint8,
+                                   "i2"=>Int16,     "u2"=>Uint16,
+                                   "i4"=>Int32,     "u4"=>Uint32,
+                                   "i8"=>Int64,     "u8"=>Uint64,
+                                   "f4"=>Float32,   "f8"=>Float64,
+                                   "c8"=>Complex64, "c16"=>Complex128,
+                                   "O$(div(WORD_SIZE,8))"=>PyPtr )
 
 #########################################################################
 # no-copy conversion of Julia arrays to NumPy arrays.