From 6afe4809f21b400b881e5ee6c1e33444e51d445e Mon Sep 17 00:00:00 2001
From: chillaranand <anand21nanda@gmail.com>
Date: Mon, 16 May 2022 11:39:30 +0530
Subject: [PATCH] refactor: Clean up setup file

---
 .pre-commit-config.yaml   | 12 +++++-------
 frappe/utils/identicon.py |  8 +++++---
 setup.py                  |  8 +++++---
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 39646f824d..e8a44f0d1e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -22,6 +22,11 @@ repos:
       - id: black
         additional_dependencies: ['click==8.0.4']
 
+  - repo: https://github.com/timothycrosley/isort
+    rev: 5.9.1
+    hooks:
+      - id: isort
+
   - repo: https://gitlab.com/pycqa/flake8
     rev: 3.9.2
     hooks:
@@ -30,13 +35,6 @@ repos:
           'flake8-bugbear',
         ]
         args: ['--config', '.github/helper/flake8.conf']
-        exclude: ".*setup.py$"
-
-  - repo: https://github.com/timothycrosley/isort
-    rev: 5.9.1
-    hooks:
-      - id: isort
-        exclude: ".*setup.py$"
 
 ci:
     autoupdate_schedule: weekly
diff --git a/frappe/utils/identicon.py b/frappe/utils/identicon.py
index 982219df2a..28df486d03 100644
--- a/frappe/utils/identicon.py
+++ b/frappe/utils/identicon.py
@@ -100,6 +100,8 @@ class Identicon(object):
 		if format.upper() not in Image.SAVE:
 			Image.init()
 		save_handler = Image.SAVE[format.upper()]
-		save_handler(self.image, fp, "")
-		fp.seek(0)
-		return "data:image/png;base64,{0}".format(base64.b64encode(fp.read()))
+		try:
+			save_handler(self.image, fp, "")
+		finally:
+			fp.seek(0)
+			return "data:image/png;base64,{0}".format(base64.b64encode(fp.read()))
diff --git a/setup.py b/setup.py
index 269b938d32..92ff63baff 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,11 @@
 # imports - standard imports
-import os, shutil
+import ast
+import os
+import re
+import shutil
 from distutils.command.clean import clean as Clean
 
-from setuptools import setup, find_packages
-import re, ast
+from setuptools import find_packages, setup
 
 # get version from __version__ variable in frappe/__init__.py
 _version_re = re.compile(r"__version__\s+=\s+(.*)")