Merge pull request #2417 from hypothesis/prospector-allow-id-as-valid-name

Fix pylint warnings about `id` name

Author: nickstenning

.prospector.yaml

@@ -25,8 +25,12 @@ pylint:
     #
     # - log: common in "log = logging.getLogger(__name__)" pattern
     # - parser: common in modules that use argparse
+    # - id: Commonly used as a class attribute / database column name in
+    #       sqlalchemy model classes. Note that if you use id as the name of
+    #       a local variable or parameter, pylint will still complain that
+    #       you're shadowing the builtin.
     #
-    good-names: _,i,j,k,v,e,db,fn,fp,log,parser
+    good-names: _,i,j,k,v,e,db,fn,fp,log,parser,id
 pep257:
   disable:
     - D100  # Missing docstring in public module

h/api/views.py

@@ -186,7 +186,7 @@ def update(context, request):
 def delete(context, request):
     """Delete the annotation permanently."""
     annotation = context
-    id = annotation['id']
+    id_ = annotation['id']
     # Delete the annotation from the database.
     annotation.delete()
 
@@ -195,7 +195,7 @@ def delete(context, request):
 
     # Return a confirmation
     return {
-        'id': id,
+        'id': id_,
         'deleted': True,
     }
 

h/notification/models.py

@@ -15,9 +15,9 @@ class Subscriptions(Base):
     active = sa.Column(sa.BOOLEAN, default=True, nullable=False)
 
     @classmethod
-    def get_by_id(cls, id):
+    def get_by_id(cls, id_):
         """Get a subscription by its primary key."""
-        return cls.query.filter(cls.id == id).first()
+        return cls.query.filter(cls.id == id_).first()
 
     @classmethod
     def get_active_subscriptions_for_a_type(cls, ttype):