|
 |
1d20423 |
From ba8f001ed9104de44229aa9306dfe5b2454ca730 Mon Sep 17 00:00:00 2001
|
|
|
1d20423 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
1d20423 |
Date: Sun, 28 Feb 2016 12:19:38 -0500
|
|
|
1d20423 |
Subject: [PATCH] Remove u'' prefix and L suffix which do not appear under
|
|
|
1d20423 |
Python 3
|
|
|
1d20423 |
|
|
|
1d20423 |
---
|
|
|
1d20423 |
igor/struct.py | 2 +-
|
|
|
1d20423 |
test/test-igorpy.py | 4 ++--
|
|
|
1d20423 |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
1d20423 |
|
|
|
1d20423 |
diff --git a/igor/struct.py b/igor/struct.py
|
|
|
1d20423 |
index ec7f20ce12..54c57eb652 100644
|
|
|
1d20423 |
--- a/igor/struct.py
|
|
|
1d20423 |
+++ b/igor/struct.py
|
|
|
1d20423 |
@@ -429,7 +429,7 @@ class Structure (_struct.Struct):
|
|
|
1d20423 |
'time': 303240213}],
|
|
|
1d20423 |
'version': 1}
|
|
|
1d20423 |
>>> [hex(x) for x in d['runs'][0]['data'].flat]
|
|
|
1d20423 |
- ['0x607L', '0x809L', '0xa0bL', '0xc0dL', '0xe0fL', '0x1011L']
|
|
|
1d20423 |
+ ['0x607', '0x809', '0xa0b', '0xc0d', '0xe0f', '0x1011']
|
|
|
1d20423 |
|
|
|
1d20423 |
You can also read out from strings:
|
|
|
1d20423 |
|
|
|
1d20423 |
diff --git a/test/test-igorpy.py b/test/test-igorpy.py
|
|
|
1d20423 |
index a015b33ea0..30ce074c88 100644
|
|
|
1d20423 |
--- a/test/test-igorpy.py
|
|
|
1d20423 |
+++ b/test/test-igorpy.py
|
|
|
1d20423 |
@@ -75,9 +75,9 @@ Waves:
|
|
|
1d20423 |
...
|
|
|
1d20423 |
0.00077303, 0.00038651, 0. ]), array([], dtype=float64), array([], dtype=float64), array([], dtype=float64)]
|
|
|
1d20423 |
>>> d.W_plrX5.data_units
|
|
|
1d20423 |
-(u'', '', '', '')
|
|
|
1d20423 |
+('', '', '', '')
|
|
|
1d20423 |
>>> d.W_plrX5.axis_units
|
|
|
1d20423 |
-(u'', '', '', '')
|
|
|
1d20423 |
+('', '', '', '')
|
|
|
1d20423 |
>>> d.W_plrX5.data # doctest: +ELLIPSIS
|
|
|
1d20423 |
array([ 1.83690956e-17, 2.69450769e-02, 7.65399113e-02,
|
|
|
1d20423 |
1.44305170e-01, 2.23293692e-01, 3.04783821e-01,
|
|
|
1d20423 |
--
|
|
|
1d20423 |
2.5.0
|
|
|
1d20423 |
|