Changeset 4342fed0 in sasview for test


Ignore:
Timestamp:
Apr 9, 2017 8:09:12 AM (3 years ago)
Author:
GitHub <noreply@…>
Branches:
master, 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, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
fca1f50
Parents:
5b2b04d (diff), 45dffa69 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Paul Butler <butlerpd@…> (04/09/17 08:09:12)
git-committer:
GitHub <noreply@…> (04/09/17 08:09:12)
Message:

Merge pull request #67 from andyfaff/is_none

MAINT: use 'is None' instead of '== None'

Location:
test
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • test/pr_inversion/test/utest_invertor.py

    r959eb01 rac07a3a  
    576576    data_err = np.zeros(0) 
    577577    scale    = None 
    578     if not path == None: 
     578    if path is not None: 
    579579        input_f = open(path,'r') 
    580580        buff    = input_f.read() 
  • test/sasdataloader/test/utest_cansas.py

    r959eb01 r7432acb  
    103103        self.assertAlmostEqual(data.detector[1].distance, 4145.02) 
    104104        self.assertTrue(data.process[0].name == "Mantid generated CanSAS1D XML") 
    105         self.assertTrue(data.meta_data["xmlpreprocess"] != None) 
     105        self.assertTrue(data.meta_data["xmlpreprocess"] is not None) 
    106106 
    107107 
  • test/sasrealspace/test/sim_validation.py

    r959eb01 rac07a3a  
    3232            #return: mean, error 
    3333        """ 
    34         if not density == None: 
     34        if density is not None: 
    3535            self.density = density 
    3636            self.create() 
     
    4545            #return: mean, error 
    4646        """ 
    47         if not density == None: 
     47        if density is not None: 
    4848            self.density = density 
    4949            self.create() 
  • test/sasrealspace/test/utest_realspace.py

    r959eb01 r45dffa69  
    326326        self.canvas.setParam('%s.radius' % handle, self.outer_radius) 
    327327        self.canvas.setParam('%s.contrast' % handle, self.shell_sld) 
    328         if not order1 == None: 
     328        if order1 is not None: 
    329329            self.canvas.setParam('%s.order' % handle, order1) 
    330330        
     
    332332        self.canvas.setParam('%s.radius' % handle2, self.radius) 
    333333        self.canvas.setParam('%s.contrast' % handle2, 1.0) 
    334         if not order2 == None: 
     334        if order2 is not None: 
    335335            self.canvas.setParam('%s.order' % handle2, order2) 
    336336                
Note: See TracChangeset for help on using the changeset viewer.