medicafe 0.250725.1__tar.gz → 0.250725.2__tar.gz

{medicafe-0.250725.1 → medicafe-0.250725.2}/MediBot/MediBot.py

@@ -1,5 +1,5 @@
 #MediBot.py
-import subprocess, os, tempfile, traceback, re, sys, time
+import subprocess, os, tempfile, traceback, re, sys, time, msvcrt
 from collections import OrderedDict
 import MediBot_dataformat_library
 import MediBot_Preprocessor
@@ -400,22 +400,24 @@ if __name__ == "__main__":
                 sys.stdout.flush()
                 time.sleep(0.2)  # Increased delay for Windows XP
                 
-                # Try raw_input first (Python 2.x compatibility), fall back to input
-                try:
-                    proceed = raw_input().lower().strip() in ['yes', 'y']
-                except NameError:
-                    proceed = input().lower().strip() in ['yes', 'y']
+                # Clear any leftover input in stdin buffer for Windows XP compatibility
+                while msvcrt.kbhit():
+                    msvcrt.getch()
+                
+                # Use sys.stdin.readline() for more reliable input on Windows XP
+                proceed = sys.stdin.readline().lower().strip() in ['yes', 'y']
             else:
                 print("\nDo you want to proceed with the {} remaining patient(s)? (yes/no): ".format(len(patients_to_process)), end='', flush=True)
                 # Force flush and wait for Windows XP console buffer synchronization
                 sys.stdout.flush()
                 time.sleep(0.2)  # Increased delay for Windows XP
                 
-                # Try raw_input first (Python 2.x compatibility), fall back to input
-                try:
-                    proceed = raw_input().lower().strip() in ['yes', 'y']
-                except NameError:
-                    proceed = input().lower().strip() in ['yes', 'y']
+                # Clear any leftover input in stdin buffer for Windows XP compatibility
+                while msvcrt.kbhit():
+                    msvcrt.getch()
+                
+                # Use sys.stdin.readline() for more reliable input on Windows XP
+                proceed = sys.stdin.readline().lower().strip() in ['yes', 'y']
 
             # TODO: Here is where we need to add the step where we move to MediBot_Charges. 
             # The return is an enriched dataset to be picked up by MediBot which means we need to return: 

{medicafe-0.250725.1 → medicafe-0.250725.2}/MediBot/MediBot_UI.py

@@ -1,5 +1,5 @@
 #MediBot_UI.py
-import ctypes, time, re, os, sys
+import ctypes, time, re, os, sys, msvcrt
 from ctypes import wintypes
 from sys import exit
 project_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
@@ -152,11 +152,12 @@ def display_patient_selection_menu(csv_data, reverse_mapping, proceed_as_medicar
     sys.stdout.flush()
     time.sleep(0.2)  # Increased delay for Windows XP
     
-    # Try raw_input first (Python 2.x compatibility), fall back to input
-    try:
-        proceed = raw_input().lower().strip() in ['yes', 'y']
-    except NameError:
-        proceed = input().lower().strip() in ['yes', 'y']
+    # Clear any leftover input in stdin buffer for Windows XP compatibility
+    while msvcrt.kbhit():
+        msvcrt.getch()
+    
+    # Use sys.stdin.readline() for more reliable input on Windows XP
+    proceed = sys.stdin.readline().lower().strip() in ['yes', 'y']
 
     if not proceed:
         display_menu_header("Patient Selection for Today's Data Entry")
@@ -170,11 +171,12 @@ def display_patient_selection_menu(csv_data, reverse_mapping, proceed_as_medicar
                 sys.stdout.flush()
                 time.sleep(0.2)  # Increased delay for Windows XP
                 
-                # Try raw_input first (Python 2.x compatibility), fall back to input
-                try:
-                    selection = raw_input().strip()
-                except NameError:
-                    selection = input().strip()
+                # Clear any leftover input in stdin buffer for Windows XP compatibility
+                while msvcrt.kbhit():
+                    msvcrt.getch()
+                
+                # Use sys.stdin.readline() for more reliable input on Windows XP
+                selection = sys.stdin.readline().strip()
                 if not selection:
                     print("Invalid entry. Please provide at least one number.")
                     continue
@@ -253,11 +255,12 @@ def handle_user_interaction(interaction_mode, error_message):
         sys.stdout.flush()
         time.sleep(0.2)  # Increased delay for Windows XP
         
-        # Try raw_input first (Python 2.x compatibility), fall back to input
-        try:
-            choice = raw_input().strip()
-        except NameError:
-            choice = input().strip()
+        # Clear any leftover input in stdin buffer for Windows XP compatibility
+        while msvcrt.kbhit():
+            msvcrt.getch()
+        
+        # Use sys.stdin.readline() for more reliable input on Windows XP
+        choice = sys.stdin.readline().strip()
         
         if choice == '1':
             print("Selected: 'Retry last entry'. Please press 'F12' to continue.")
@@ -295,11 +298,12 @@ def user_interaction(csv_data, interaction_mode, error_message, reverse_mapping)
                 sys.stdout.flush()
                 time.sleep(0.2)  # Increased delay for Windows XP
                 
-                # Try raw_input first (Python 2.x compatibility), fall back to input
-                try:
-                    response = raw_input().lower().strip()
-                except NameError:
-                    response = input().lower().strip()
+                # Clear any leftover input in stdin buffer for Windows XP compatibility
+                while msvcrt.kbhit():
+                    msvcrt.getch()
+                
+                # Use sys.stdin.readline() for more reliable input on Windows XP
+                response = sys.stdin.readline().lower().strip()
                 
                 if response:
                     if response in ['yes', 'y']:

{medicafe-0.250725.1 → medicafe-0.250725.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: medicafe
-Version: 0.250725.1
+Version: 0.250725.2
 Summary: MediCafe
 Home-page: https://github.com/katanada2
 Author: Daniel Vidaud

{medicafe-0.250725.1 → medicafe-0.250725.2}/medicafe.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: medicafe
-Version: 0.250725.1
+Version: 0.250725.2
 Summary: MediCafe
 Home-page: https://github.com/katanada2
 Author: Daniel Vidaud

{medicafe-0.250725.1 → medicafe-0.250725.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='medicafe',
-    version="0.250725.1",
+    version="0.250725.2",
     description='MediCafe',
     long_description="""
     # Project Overview: MediCafe