diff options
| -rw-r--r-- | postgresqleu/adyen/management/commands/process_adyen_reports.py | 2 | ||||
| -rw-r--r-- | postgresqleu/confreg/backendviews.py | 2 | ||||
| -rw-r--r-- | postgresqleu/confreg/models.py | 6 | ||||
| -rw-r--r-- | postgresqleu/confreg/pdfschedule.py | 2 | ||||
| -rw-r--r-- | postgresqleu/confreg/util.py | 2 | ||||
| -rw-r--r-- | postgresqleu/confreg/views.py | 10 | ||||
| -rw-r--r-- | postgresqleu/newsevents/feeds.py | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/postgresqleu/adyen/management/commands/process_adyen_reports.py b/postgresqleu/adyen/management/commands/process_adyen_reports.py index 95727c15..2c74281d 100644 --- a/postgresqleu/adyen/management/commands/process_adyen_reports.py +++ b/postgresqleu/adyen/management/commands/process_adyen_reports.py @@ -93,7 +93,7 @@ class Command(BaseCommand): if self.verbose: self.stdout.write("Sent for settle on {0}".format(pspref)) elif l['Record Type'] in ('Settled', 'SettledBulk'): - if trans.settledat != None: + if trans.settledat is not None: # Transaction already settled. But we might be reprocessing # the report, so verify if the previously settled one is # *identical*. diff --git a/postgresqleu/confreg/backendviews.py b/postgresqleu/confreg/backendviews.py index a58e6648..56037f63 100644 --- a/postgresqleu/confreg/backendviews.py +++ b/postgresqleu/confreg/backendviews.py @@ -303,7 +303,7 @@ def backend_list_editor(request, urlname, formclass, resturl, allow_new=True, al if resturl: resturl = resturl.rstrip('/') - if resturl == '' or resturl == None: + if resturl == '' or resturl is None: # Render the list of objects if bypass_conference_filter: objects = formclass.Meta.model.objects.all() diff --git a/postgresqleu/confreg/models.py b/postgresqleu/confreg/models.py index ec04ddbe..1e7db52c 100644 --- a/postgresqleu/confreg/models.py +++ b/postgresqleu/confreg/models.py @@ -490,9 +490,9 @@ class ConferenceRegistration(models.Model): def has_invoice(self): # Return if this registration has an invoice, whether through # a direct invoice or a bulk payment. - if not self.invoice is None: + if self.invoice is not None: return True - if not self.bulkpayment is None: + if self.bulkpayment is not None: return True return False has_invoice.boolean = True @@ -648,7 +648,7 @@ class Speaker(models.Model): has_abstract.boolean = True def has_photo(self): - return (self.photofile != None and self.photofile != "") + return (self.photofile is not None and self.photofile != "") has_photo.boolean = True def __unicode__(self): diff --git a/postgresqleu/confreg/pdfschedule.py b/postgresqleu/confreg/pdfschedule.py index d1f086d1..2345cc69 100644 --- a/postgresqleu/confreg/pdfschedule.py +++ b/postgresqleu/confreg/pdfschedule.py @@ -98,7 +98,7 @@ def build_linear_pdf_schedule(conference, room, tracks, day, colored, pagesize, for s in sessions: if s.starttime.date() != lastdate: - if lastdate != None: + if lastdate is not None: # New page for a new day! _finalize_page() lastdate = s.starttime.date() diff --git a/postgresqleu/confreg/util.py b/postgresqleu/confreg/util.py index d021a043..6214c6d7 100644 --- a/postgresqleu/confreg/util.py +++ b/postgresqleu/confreg/util.py @@ -195,7 +195,7 @@ def cancel_registration(reg, is_unconfirmed=False): def get_invoice_autocancel(*args): # Each argument is expected to be an integer with number of hours, # or None if there is no limit - hours = [a for a in args if not a is None] + hours = [a for a in args if a is not None] if hours: return datetime.now() + timedelta(hours=min(hours)) else: diff --git a/postgresqleu/confreg/views.py b/postgresqleu/confreg/views.py index d9830527..0d129a62 100644 --- a/postgresqleu/confreg/views.py +++ b/postgresqleu/confreg/views.py @@ -215,7 +215,7 @@ def register(request, confname, whatfor=None): # No previous registration exists. Let the user choose what to # do. If already under "self" suburl, copy the data from the # user profile and move on. - if whatfor == None: + if whatfor is None: return render_conference_response(request, conference, 'reg', 'confreg/prompt_regfor.html') # No previous registration, grab some data from the user profile @@ -2322,7 +2322,7 @@ def createschedule(request, confname): # Get the current list of tentatively scheduled talks s = {} for sess in conference.conferencesession_set.all(): - if sess.tentativeroom != None and sess.tentativescheduleslot != None: + if sess.tentativeroom is not None and sess.tentativescheduleslot is not None: s['slot%s' % ((sess.tentativeroom.id * 1000000) + sess.tentativescheduleslot.id)] = 'sess%s' % sess.id return HttpResponse(json.dumps(s), content_type="application/json") @@ -2344,7 +2344,7 @@ def createschedule(request, confname): raise Exception("Could not find slot, invalid data in POST") roomid = int(int(sm.group(1)) / 1000000) slotid = int(sm.group(1)) % 1000000 - if sess.tentativeroom == None or sess.tentativeroom.id != roomid or sess.tentativescheduleslot == None or sess.tentativescheduleslot.id != slotid: + if sess.tentativeroom is None or sess.tentativeroom.id != roomid or sess.tentativescheduleslot is None or sess.tentativescheduleslot.id != slotid: sess.tentativeroom = Room.objects.get(pk=roomid) sess.tentativescheduleslot = ConferenceSessionScheduleSlot.objects.get(pk=slotid) sess.save() @@ -2634,7 +2634,7 @@ WHERE dc.conference_id={1} AND (r.conference_id={1} OR r.conference_id IS NULL) for cn in range(1, t['fixedcols']): sums.append('') for cn in range(t['fixedcols'] - 1, len(t['columns']) - 1): - sums.append(sum((r[cn + 1] for r in t['rows'] if r[cn + 1] != None))) + sums.append(sum((r[cn + 1] for r in t['rows'] if r[cn + 1] is not None))) t['rows'] = [(r, t.get('linker', lambda x: None)(r)) for r in t['rows']] t['rows'].append((sums, None)) return render(request, 'confreg/admin_registration_dashboard.html', { @@ -3258,7 +3258,7 @@ def crossmail(request): messages.info(request, "Sent {0} emails.".format(len(recipients))) return HttpResponseRedirect("../") if not recipients: - if recipients != None: + if recipients is not None: form.add_error(None, "No recipients matched") form.remove_confirm() else: diff --git a/postgresqleu/newsevents/feeds.py b/postgresqleu/newsevents/feeds.py index 4deb38ab..9d280035 100644 --- a/postgresqleu/newsevents/feeds.py +++ b/postgresqleu/newsevents/feeds.py @@ -34,7 +34,7 @@ class LatestNews(Feed): def items(self, obj): # Front page news is a mix of global and conference news, possibly # filtered by NewsPosterProfile. - if obj == None: + if obj is None: extrafilter = "" params = {} else: |