From d2495d2eefe560185a9258b321aaeeb07e578ce0 Mon Sep 17 00:00:00 2001 From: stevenhua0320 Date: Fri, 16 Aug 2024 22:41:50 +0800 Subject: [PATCH 1/2] deprecation remove --- src/diffpy/srmise/basefunction.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/diffpy/srmise/basefunction.py b/src/diffpy/srmise/basefunction.py index ebeee5e..2ea55b2 100644 --- a/src/diffpy/srmise/basefunction.py +++ b/src/diffpy/srmise/basefunction.py @@ -18,7 +18,6 @@ import sys import numpy as np -from numpy.compat import unicode from diffpy.srmise.srmiseerrors import SrMiseDataFormatError @@ -100,7 +99,7 @@ def __init__( # arbitrary types, parameters are indexed by these keys as well as # integer indices. Restricting keys to strings keeps things sane. for p in self.parameterdict.keys(): - if type(p) not in (str, unicode): + if isinstance(p, str): emsg = "Argument parameterdict's keys must be strings." raise ValueError(emsg) vals = self.parameterdict.values() From b6ffe289d64a8cc95399f5595a51d68e13a25174 Mon Sep 17 00:00:00 2001 From: stevenhua0320 Date: Fri, 16 Aug 2024 23:12:48 +0800 Subject: [PATCH 2/2] fix to right behavior --- src/diffpy/srmise/basefunction.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/diffpy/srmise/basefunction.py b/src/diffpy/srmise/basefunction.py index 2ea55b2..b2acc2c 100644 --- a/src/diffpy/srmise/basefunction.py +++ b/src/diffpy/srmise/basefunction.py @@ -99,7 +99,7 @@ def __init__( # arbitrary types, parameters are indexed by these keys as well as # integer indices. Restricting keys to strings keeps things sane. for p in self.parameterdict.keys(): - if isinstance(p, str): + if not isinstance(p, str): emsg = "Argument parameterdict's keys must be strings." raise ValueError(emsg) vals = self.parameterdict.values()