1 files changed, 6 insertions, 22 deletions
diff --git a/lib/dtas.rb b/lib/dtas.rb
index 1eac704..cb7c33d 100644
--- a/lib/dtas.rb
+++ b/lib/dtas.rb
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2020 all contributors <dtas-all@nongnu.org>
+# Copyright (C) all contributors <dtas-all@nongnu.org>
  # License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt>
  # frozen_string_literal: true
  
@@ -9,15 +9,8 @@ module DTAS
    # try to use the monotonic clock in Ruby >= 2.1, it is immune to clock
    # offset adjustments and generates less garbage (Float vs Time object)
    # :stopdoc:
-  begin
+  def self.now # :nodoc:
      ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
-    def self.now # :nodoc:
-      ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
-    end
-  rescue NameError, NoMethodError
-    def self.now # :nodoc:
-      Time.now.to_f # Ruby <= 2.0
-    end
    end
  
    @null = nil
@@ -33,22 +26,13 @@ module DTAS
      end
    end
  
-  # String#-@ will deduplicate strings when Ruby 2.5 is released (Dec 2017)
-  # https://bugs.ruby-lang.org/issues/13077
-  if RUBY_VERSION.to_f >= 2.5
-    def self.dedupe_str(str)
-      -str
-    end
-  else
-    # Ruby 2.1 - 2.4, noop for older Rubies
-    def self.dedupe_str(str)
-      eval "#{str.inspect}.freeze"
-    end
+  # prevent breakage in Psych 4.x; we're a shell and designed to execute code
+  def self.yaml_load(buf)
+    require 'yaml'
+    YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(buf) : YAML.load(buf)
    end
    # :startdoc:
  end
  
-require_relative 'dtas/compat_onenine'
-require_relative 'dtas/spawn_fix'
  require_relative 'dtas/encoding'
  DTAS.extend(DTAS::Encoding)