From 2cf832e499706d9f571e7bfbd94283189749f323 Mon Sep 17 00:00:00 2001
From: Sam Yates <halfflat@gmail.com>
Date: Tue, 25 Jun 2019 17:09:15 +0200
Subject: [PATCH] Fix import error for python2/validation scripts (#797)

Building validation data with python2 can raise an import error for `builtins`.

* Catch import error, and import from `__builtin__` instead.
---
 validation/ref/neuron/ball_and_squiggle.py | 6 +++++-
 validation/ref/neuron/nrn_validation.py    | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/validation/ref/neuron/ball_and_squiggle.py b/validation/ref/neuron/ball_and_squiggle.py
index 258eb5e7..9fcc5b49 100644
--- a/validation/ref/neuron/ball_and_squiggle.py
+++ b/validation/ref/neuron/ball_and_squiggle.py
@@ -4,7 +4,11 @@
 import json
 import math
 import nrn_validation as V
-from builtins import range
+
+try:
+    from builtins import range
+except ImportError:
+    from __builtin__ import range
 
 V.override_defaults_from_args()
 
diff --git a/validation/ref/neuron/nrn_validation.py b/validation/ref/neuron/nrn_validation.py
index caeb357c..a9249374 100644
--- a/validation/ref/neuron/nrn_validation.py
+++ b/validation/ref/neuron/nrn_validation.py
@@ -8,7 +8,11 @@ import re
 import numpy as np
 import neuron
 from neuron import h
-from builtins import range
+
+try:
+    from builtins import range
+except ImportError:
+    from __builtin__ import range
 
 # This is super annoying: without neuron.gui, need
 # to explicit load 'standard' hoc routines like 'run',
-- 
GitLab