From 72b11691cb2c4b832ef80619862b70c09f1c6722 Mon Sep 17 00:00:00 2001
From: smit thakkar <smitthakkar96@gmail.com>
Date: Feb 19 2017 04:11:16 +0000
Subject: [PATCH 1/4] Merge branch 'master' of ssh://pagure.io/pagure


---

diff --git a/pagure/forms.py b/pagure/forms.py
index 1e88704..f175f8f 100644
--- a/pagure/forms.py
+++ b/pagure/forms.py
@@ -99,6 +99,7 @@ def file_virus_validator(form, field):
 
 
 def ssh_key_validator(form, field):
+    ''' Form for ssh key validation '''
     if not pagure.lib.are_valid_ssh_keys(field.data):
         raise wtforms.ValidationError('Invalid SSH keys')
 

From f83718b969265f7d643fe99332c6d2a3082bd311 Mon Sep 17 00:00:00 2001
From: smit thakkar <smitthakkar96@gmail.com>
Date: Feb 22 2017 11:26:55 +0000
Subject: [PATCH 2/4] Addded exception types where we were handling exceptions in a too

genric way.

---

diff --git a/pagure/api/issue.py b/pagure/api/issue.py
index 25bcce2..95a51b4 100644
--- a/pagure/api/issue.py
+++ b/pagure/api/issue.py
@@ -322,7 +322,7 @@ def api_view_issues(repo, username=None, namespace=None):
             else:
                 # We assume datetime format, so validate it
                 try:
-                    updated_after= datetime.datetime.strptime(
+                    updated_after = datetime.datetime.strptime(
                         since, '%Y-%m-%d')
                 except ValueError:
                     raise pagure.exceptions.APIError(
@@ -413,7 +413,7 @@ def api_view_issue(repo, issueid, username=None, namespace=None):
     issue_id = issue_uid = None
     try:
         issue_id = int(issueid)
-    except:
+    except ValueError:
         issue_uid = issueid
 
     issue = pagure.lib.search_issues(
@@ -500,7 +500,7 @@ def api_view_issue_comment(
     issue_id = issue_uid = None
     try:
         issue_id = int(issueid)
-    except:
+    except ValueError:
         issue_uid = issueid
 
     issue = pagure.lib.search_issues(

From cc0ca5309b441e0911c70b22a08e99df6854f273 Mon Sep 17 00:00:00 2001
From: smit thakkar <smitthakkar96@gmail.com>
Date: Feb 22 2017 11:29:56 +0000
Subject: [PATCH 3/4] in ui/issues.py the exceptions were handeled too generically so add

exception types.

---

diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py
index 25b633b..5345411 100644
--- a/pagure/ui/issues.py
+++ b/pagure/ui/issues.py
@@ -176,7 +176,7 @@ def update_issue(repo, issueid, username=None, namespace=None):
         new_priority = None
         try:
             new_priority = int(form.priority.data)
-        except:
+        except ValueError:
             pass
         tags = [
             tag.strip()
@@ -187,7 +187,7 @@ def update_issue(repo, issueid, username=None, namespace=None):
         try:
             if repo.milestones:
                 new_milestone = form.milestone.data.strip() or None
-        except:
+        except ValueError:
             pass
 
         try:
@@ -611,7 +611,7 @@ def view_issues(repo, username=None, namespace=None):
 
     try:
         priority = int(priority)
-    except:
+    except ValueError:
         priority = None
 
     # Hide private tickets

From 080f4468f6cf4f1e93b17ea2e138c85768ee29a6 Mon Sep 17 00:00:00 2001
From: smit thakkar <smitthakkar96@gmail.com>
Date: Feb 22 2017 12:23:31 +0000
Subject: [PATCH 4/4] Revert "Merge branch 'master' of ssh://pagure.io/pagure"


This reverts commit 72b11691cb2c4b832ef80619862b70c09f1c6722, reversing
changes made to f6d47f85e41a612894d5566ed9d6172de7bad08a.

---

diff --git a/pagure/forms.py b/pagure/forms.py
index f175f8f..1e88704 100644
--- a/pagure/forms.py
+++ b/pagure/forms.py
@@ -99,7 +99,6 @@ def file_virus_validator(form, field):
 
 
 def ssh_key_validator(form, field):
-    ''' Form for ssh key validation '''
     if not pagure.lib.are_valid_ssh_keys(field.data):
         raise wtforms.ValidationError('Invalid SSH keys')