Consistent use of identity comparison (`is`/`is not`) for None #1930

Merged
merged 3 commits into from Jan 3, 2014

Projects

None yet

2 participants

@oxtopus
Contributor
oxtopus commented Dec 19, 2013

No description provided.

@danielgtaylor danielgtaylor and 1 other commented on an outdated diff Dec 19, 2013
boto/sdb/queryresultset.py
@@ -33,7 +33,9 @@ def query_lister(domain, query='', max_items=None, attr_names=None):
yield item
num_results += 1
next_token = rs.next_token
- more_results = next_token != None
+ more_results = next_token is not None
+
+class QueryResultSet:
@danielgtaylor
danielgtaylor Dec 19, 2013 Member

Looks like this line was a bad merge?

@oxtopus
oxtopus Dec 19, 2013 Contributor

Never mind my last comment, I was viewing it on my phone and didn't quite catch the context. Yes, bad merge. My bad. I'm on the road today and may not be able to fix it until tomorrow evening.

Good catch!

@oxtopus
Contributor
oxtopus commented Dec 19, 2013

Should be good now. Forgot I could edit it from the github web interface.

@oxtopus oxtopus Merge remote-tracking branch 'upstream/develop' into consistent-ident…
…ity-comparison-none

Conflicts:
	boto/manage/server.py
6744439
@danielgtaylor
Member

Thanks!

@danielgtaylor danielgtaylor merged commit 8597c54 into boto:develop Jan 3, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment