Ignore:
Timestamp:
Nov 9, 2017 6:41:55 AM (7 years ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc
Children:
7fb471d
Parents:
b3e8629
git-author:
Piotr Rozyczko <rozyczko@…> (10/27/17 01:42:57)
git-committer:
Piotr Rozyczko <rozyczko@…> (11/09/17 06:41:55)
Message:

Converted more syntax not covered by 2to3

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Plotting/PlotterData.py

    • Property mode changed from 100755 to 100644
    r749b715 rcee5c78  
    7272        result.clone_without_data(length=len(self.x), clone=self) 
    7373        result.copy_from_datainfo(data1d=self) 
    74         if self.dxw == None: 
     74        if self.dxw is None: 
    7575            result.dxw = None 
    7676        else: 
    7777            result.dxw = numpy.zeros(len(self.x)) 
    78         if self.dxl == None: 
     78        if self.dxl is None: 
    7979            result.dxl = None 
    8080        else: 
     
    119119        tot_length = len(self.x) + len(other.x) 
    120120        result = self.clone_without_data(length=tot_length, clone=result) 
    121         if self.dy == None or other.dy is None: 
     121        if self.dy is None or other.dy is None: 
    122122            result.dy = None 
    123123        else: 
    124124            result.dy = numpy.zeros(tot_length) 
    125         if self.dx == None or other.dx is None: 
     125        if self.dx is None or other.dx is None: 
    126126            result.dx = None 
    127127        else: 
    128128            result.dx = numpy.zeros(tot_length) 
    129         if self.dxw == None or other.dxw is None: 
     129        if self.dxw is None or other.dxw is None: 
    130130            result.dxw = None 
    131131        else: 
    132132            result.dxw = numpy.zeros(tot_length) 
    133         if self.dxl == None or other.dxl is None: 
     133        if self.dxl is None or other.dxl is None: 
    134134            result.dxl = None 
    135135        else: 
     
    142142        result.y = numpy.append(self.y, other.y) 
    143143        result.y = result.y[ind] 
    144         if result.dy != None: 
     144        if result.dy is not None: 
    145145            result.dy = numpy.append(self.dy, other.dy) 
    146146            result.dy = result.dy[ind] 
     
    239239        result.ymin = self.ymin 
    240240        result.ymax = self.ymax 
    241         if self.dqx_data == None or self.dqy_data == None: 
     241        if self.dqx_data is None or self.dqy_data is None: 
    242242            result.dqx_data = None 
    243243            result.dqy_data = None 
     
    302302        result.ymin = self.ymin 
    303303        result.ymax = self.ymax 
    304         if self.dqx_data == None or self.dqy_data == None or \ 
    305                 other.dqx_data == None or other.dqy_data == None : 
     304        if self.dqx_data is None or self.dqy_data is None or \ 
     305                other.dqx_data is None or other.dqy_data is None : 
    306306            result.dqx_data = None 
    307307            result.dqy_data = None 
Note: See TracChangeset for help on using the changeset viewer.