Let's centralize try_int(). Should be in a lib, not a little script like it was.

mikeckennedy · mikeckennedy · commit 10a84d0f5e29 · 2019-10-10T13:50:54.000-07:00
diff --git a/.idea/dictionaries/mkennedy.xml b/.idea/dictionaries/mkennedy.xml
diff --git a/app/ch10_using_sqlachemy/final/pypi_org/bin/load_data.py b/app/ch10_using_sqlachemy/final/pypi_org/bin/load_data.py
@@ -10,6 +10,7 @@
 sys.path.insert(0, os.path.abspath(os.path.join(
     os.path.dirname(__file__), "..", "..")))
 
+from pypi_org.infrastructure.num_convert import try_int
 import pypi_org.data.db_session as db_session
 from pypi_org.data.languages import ProgrammingLanguage
 from pypi_org.data.licenses import License
@@ -339,13 +340,6 @@ def make_version_num(version_text):
         return major, minor, build
 
 
-def try_int(text) -> int:
-    try:
-        return int(text)
-    except:
-        return 0
-
-
 def init_db():
     top_folder = os.path.dirname(__file__)
     rel_file = os.path.join('..', 'db', 'pypi.sqlite')
diff --git a/app/ch10_using_sqlachemy/final/pypi_org/infrastructure/num_convert.py b/app/ch10_using_sqlachemy/final/pypi_org/infrastructure/num_convert.py
@@ -0,0 +1,5 @@
+def try_int(text) -> int:
+    try:
+        return int(text)
+    except:
+        return 0
diff --git a/app/ch11_migrations/final/pypi_org/bin/load_data.py b/app/ch11_migrations/final/pypi_org/bin/load_data.py
@@ -10,6 +10,7 @@
 sys.path.insert(0, os.path.abspath(os.path.join(
     os.path.dirname(__file__), "..", "..")))
 
+from pypi_org.bin.load_data import try_int
 import pypi_org.data.db_session as db_session
 from pypi_org.data.languages import ProgrammingLanguage
 from pypi_org.data.licenses import License
@@ -339,13 +340,6 @@ def make_version_num(version_text):
         return major, minor, build
 
 
-def try_int(text) -> int:
-    try:
-        return int(text)
-    except:
-        return 0
-
-
 def init_db():
     top_folder = os.path.dirname(__file__)
     rel_file = os.path.join('..', 'db', 'pypi.sqlite')
diff --git a/app/ch11_migrations/starter/pypi_org/bin/load_data.py b/app/ch11_migrations/starter/pypi_org/bin/load_data.py
@@ -10,6 +10,7 @@
 sys.path.insert(0, os.path.abspath(os.path.join(
     os.path.dirname(__file__), "..", "..")))
 
+from pypi_org.infrastructure.num_convert import try_int
 import pypi_org.data.db_session as db_session
 from pypi_org.data.languages import ProgrammingLanguage
 from pypi_org.data.licenses import License
@@ -339,13 +340,6 @@ def make_version_num(version_text):
         return major, minor, build
 
 
-def try_int(text) -> int:
-    try:
-        return int(text)
-    except:
-        return 0
-
-
 def init_db():
     top_folder = os.path.dirname(__file__)
     rel_file = os.path.join('..', 'db', 'pypi.sqlite')
diff --git a/app/ch11_migrations/starter/pypi_org/infrastructure/num_convert.py b/app/ch11_migrations/starter/pypi_org/infrastructure/num_convert.py
@@ -0,0 +1,5 @@
+def try_int(text) -> int:
+    try:
+        return int(text)
+    except:
+        return 0
diff --git a/app/ch12-forms/final/pypi_org/bin/load_data.py b/app/ch12-forms/final/pypi_org/bin/load_data.py
@@ -10,6 +10,7 @@
 sys.path.insert(0, os.path.abspath(os.path.join(
     os.path.dirname(__file__), "..", "..")))
 
+from pypi_org.infrastructure.num_convert import try_int
 import pypi_org.data.db_session as db_session
 from pypi_org.data.languages import ProgrammingLanguage
 from pypi_org.data.licenses import License
@@ -339,13 +340,6 @@ def make_version_num(version_text):
         return major, minor, build
 
 
-def try_int(text) -> int:
-    try:
-        return int(text)
-    except:
-        return 0
-
-
 def init_db():
     top_folder = os.path.dirname(__file__)
     rel_file = os.path.join('..', 'db', 'pypi.sqlite')
diff --git a/app/ch12-forms/starter/pypi_org/bin/load_data.py b/app/ch12-forms/starter/pypi_org/bin/load_data.py
@@ -10,6 +10,7 @@
 sys.path.insert(0, os.path.abspath(os.path.join(
     os.path.dirname(__file__), "..", "..")))
 
+from pypi_org.infrastructure.num_convert import try_int
 import pypi_org.data.db_session as db_session
 from pypi_org.data.languages import ProgrammingLanguage
 from pypi_org.data.licenses import License
@@ -339,13 +340,6 @@ def make_version_num(version_text):
         return major, minor, build
 
 
-def try_int(text) -> int:
-    try:
-        return int(text)
-    except:
-        return 0
-
-
 def init_db():
     top_folder = os.path.dirname(__file__)
     rel_file = os.path.join('..', 'db', 'pypi.sqlite')
diff --git a/app/ch12-forms/starter/pypi_org/infrastructure/num_convert.py b/app/ch12-forms/starter/pypi_org/infrastructure/num_convert.py
@@ -0,0 +1,5 @@
+def try_int(text) -> int:
+    try:
+        return int(text)
+    except:
+        return 0
diff --git a/app/ch13-validation/final/pypi_org/infrastructure/cookie_auth.py b/app/ch13-validation/final/pypi_org/infrastructure/cookie_auth.py
@@ -5,7 +5,7 @@
 from flask import Request
 from flask import Response
 
-from pypi_org.bin.load_data import try_int
+from pypi_org.infrastructure.num_convert import try_int
 
 auth_cookie_name = 'pypi_demo_user'
 
diff --git a/app/ch13-validation/final/pypi_org/infrastructure/num_convert.py b/app/ch13-validation/final/pypi_org/infrastructure/num_convert.py
@@ -0,0 +1,5 @@
+def try_int(text) -> int:
+    try:
+        return int(text)
+    except:
+        return 0
diff --git a/app/ch13-validation/starter/pypi_org/infrastructure/cookie_auth.py b/app/ch13-validation/starter/pypi_org/infrastructure/cookie_auth.py
@@ -5,7 +5,7 @@
 from flask import Request
 from flask import Response
 
-from pypi_org.bin.load_data import try_int
+from pypi_org.infrastructure.num_convert import try_int
 
 auth_cookie_name = 'pypi_demo_user'
 
diff --git a/app/ch13-validation/starter/pypi_org/infrastructure/num_convert.py b/app/ch13-validation/starter/pypi_org/infrastructure/num_convert.py
@@ -0,0 +1,5 @@
+def try_int(text) -> int:
+    try:
+        return int(text)
+    except:
+        return 0
diff --git a/app/ch14_testing/final/pypi_org/infrastructure/cookie_auth.py b/app/ch14_testing/final/pypi_org/infrastructure/cookie_auth.py
@@ -5,7 +5,7 @@
 from flask import Request
 from flask import Response
 
-from pypi_org.bin.load_data import try_int
+from pypi_org.infrastructure.num_convert import try_int
 
 auth_cookie_name = 'pypi_demo_user'
 
diff --git a/app/ch14_testing/final/pypi_org/infrastructure/num_convert.py b/app/ch14_testing/final/pypi_org/infrastructure/num_convert.py
@@ -0,0 +1,5 @@
+def try_int(text) -> int:
+    try:
+        return int(text)
+    except:
+        return 0
diff --git a/app/ch14_testing/starter/pypi_org/infrastructure/cookie_auth.py b/app/ch14_testing/starter/pypi_org/infrastructure/cookie_auth.py
@@ -5,7 +5,7 @@
 from flask import Request
 from flask import Response
 
-from pypi_org.bin.load_data import try_int
+from pypi_org.infrastructure.num_convert import try_int
 
 auth_cookie_name = 'pypi_demo_user'
 
diff --git a/app/ch14_testing/starter/pypi_org/infrastructure/num_convert.py b/app/ch14_testing/starter/pypi_org/infrastructure/num_convert.py
@@ -0,0 +1,5 @@
+def try_int(text) -> int:
+    try:
+        return int(text)
+    except:
+        return 0
diff --git a/app/ch15_deploy/final/pypi_org/infrastructure/cookie_auth.py b/app/ch15_deploy/final/pypi_org/infrastructure/cookie_auth.py
@@ -5,7 +5,7 @@
 from flask import Request
 from flask import Response
 
-from pypi_org.bin.load_data import try_int
+from pypi_org.infrastructure.num_convert import try_int
 
 auth_cookie_name = 'pypi_demo_user'
 
diff --git a/app/ch15_deploy/final/pypi_org/infrastructure/num_convert.py b/app/ch15_deploy/final/pypi_org/infrastructure/num_convert.py
@@ -0,0 +1,5 @@
+def try_int(text) -> int:
+    try:
+        return int(text)
+    except:
+        return 0
diff --git a/app/ch15_deploy/starter/pypi_org/infrastructure/cookie_auth.py b/app/ch15_deploy/starter/pypi_org/infrastructure/cookie_auth.py
@@ -5,7 +5,7 @@
 from flask import Request
 from flask import Response
 
-from pypi_org.bin.load_data import try_int
+from pypi_org.infrastructure.num_convert import try_int
 
 auth_cookie_name = 'pypi_demo_user'
 
diff --git a/app/ch15_deploy/starter/pypi_org/infrastructure/num_convert.py b/app/ch15_deploy/starter/pypi_org/infrastructure/num_convert.py
@@ -0,0 +1,5 @@
+def try_int(text) -> int:
+    try:
+        return int(text)
+    except:
+        return 0
diff --git a/app/ch16_mongodb/final/pypi_org/infrastructure/cookie_auth.py b/app/ch16_mongodb/final/pypi_org/infrastructure/cookie_auth.py
@@ -2,11 +2,10 @@
 from datetime import timedelta
 from typing import Optional
 
-import bson
 from flask import Request
 from flask import Response
 
-from pypi_org.bin.load_data import try_int
+from pypi_org.infrastructure.num_convert import try_int
 
 auth_cookie_name = 'pypi_demo_user'
 
@@ -26,7 +25,7 @@ def __add_cookie_callback(_, response: Response, name: str, value: str):
     response.set_cookie(name, value, max_age=timedelta(days=30))
 
 
-def get_user_id_via_auth_cookie(request: Request) -> Optional[bson.ObjectId]:
+def get_user_id_via_auth_cookie(request: Request) -> Optional[int]:
     if auth_cookie_name not in request.cookies:
         return None
 
@@ -42,10 +41,7 @@ def get_user_id_via_auth_cookie(request: Request) -> Optional[bson.ObjectId]:
         print("Warning: Hash mismatch, invalid cookie value")
         return None
 
-    try:
-        return bson.ObjectId(user_id)
-    except:
-        return None
+    return try_int(user_id)
 
 
 def logout(response: Response):
diff --git a/app/ch16_mongodb/final/pypi_org/infrastructure/num_convert.py b/app/ch16_mongodb/final/pypi_org/infrastructure/num_convert.py
@@ -0,0 +1,5 @@
+def try_int(text) -> int:
+    try:
+        return int(text)
+    except:
+        return 0
diff --git a/app/ch16_mongodb/starter/pypi_org/infrastructure/cookie_auth.py b/app/ch16_mongodb/starter/pypi_org/infrastructure/cookie_auth.py
@@ -5,7 +5,7 @@
 from flask import Request
 from flask import Response
 
-from pypi_org.bin.load_data import try_int
+from pypi_org.infrastructure.num_convert import try_int
 
 auth_cookie_name = 'pypi_demo_user'
 
diff --git a/app/ch16_mongodb/starter/pypi_org/infrastructure/num_convert.py b/app/ch16_mongodb/starter/pypi_org/infrastructure/num_convert.py
@@ -0,0 +1,5 @@
+def try_int(text) -> int:
+    try:
+        return int(text)
+    except:
+        return 0
