Update to Dates parsing interface (#134)

Change as a part of: JuliaLang/julia#26628
JuliaTime · Apr 14, 2018 · ce5871e · ce5871e
1 parent 13de88e
commit ce5871e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/parse.jl b/src/parse.jl
@@ -33,7 +33,11 @@ function tryparsenext_fixedtz(str, i, len, min_width::Int=1, max_width::Int=0)
     end
 
     if tz_end <= min_pos
-        return nullable(String, nothing), i
+        return @static if VERSION < v"0.7.0-DEV.4797"
+            nullable(String, nothing), i
+        else
+            nothing
+        end
     else
         tz = SubString(str, tz_start, tz_end)
         return nullable(String, tz), i
@@ -55,7 +59,11 @@ function tryparsenext_tz(str, i, len, min_width::Int=1, max_width::Int=0)
     end
 
     if tz_end == 0
-        return nullable(String, nothing), i
+        return @static if VERSION < v"0.7.0-DEV.4797"
+            nullable(String, nothing), i
+        else
+            nothing
+        end
     else
         name = SubString(str, tz_start, tz_end)
 
@@ -65,7 +73,11 @@ function tryparsenext_tz(str, i, len, min_width::Int=1, max_width::Int=0)
         if occursin("/", name) || name in ("UTC", "GMT")
             return nullable(String, name), i
         else
-            return nullable(String, nothing), i
+            return @static if VERSION < v"0.7.0-DEV.4797"
+                nullable(String, nothing), i
+            else
+                nothing
+            end
         end
     end
 end

diff --git a/test/io.jl b/test/io.jl
@@ -1,4 +1,4 @@
-import TimeZones.TZData: parse_components
+using TimeZones.TZData: parse_components
 
 null = FixedTimeZone("", 10800)
 fixed = FixedTimeZone("UTC+01:00")