update

Author: jaredmauch

Mailman/Queue/Switchboard.py

@@ -213,46 +213,23 @@ def dequeue(self, filebase):
                 mailman_log('warning', 'Queue file does not exist: %s (not found in backup or shunt either)', filename)
             return None, None
 
-        # Create a lock file
-        lockfile = filename + '.lock'
-        try:
-            # Try to create the lock file
-            fd = os.open(lockfile, os.O_CREAT | os.O_EXCL | os.O_WRONLY, 0o644)
-            os.close(fd)
-        except OSError as e:
-            if e.errno != errno.EEXIST:
-                mailman_log('error', 'Switchboard.dequeue: Failed to create lock file for %s: %s', filebase, str(e))
-                raise
-            mailman_log('debug', 'Queue file %s is currently locked by another process', filename)
-            return None, None
-
+        # Read the message object and metadata.
+        fp = open(filename, 'rb')
+        # Move the file to the backup file name for processing.  If this
+        # process crashes uncleanly the .bak file will be used to re-instate
+        # the .pck file in order to try again.
+        os.rename(filename, bakfile)
         try:
-            # Read the message and metadata
-            try:
-                msg, data = self._dequeue(filename)
-                # Add filebase to msgdata for cleanup
-                if data is not None:
-                    data['filebase'] = filebase
-                # Log the full msgdata after dequeuing
-                mailman_log('debug', 'Switchboard.dequeue: Successfully dequeued file %s', filebase)
-            except Exception as e:
-                mailman_log('error', 'Switchboard.dequeue: Failed to read message from %s: %s\nTraceback:\n%s', 
-                           filebase, str(e), traceback.format_exc())
-                raise
-
-            # Validate data structure before returning
-            if not isinstance(data, dict):
-                mailman_log('error', 'Switchboard.dequeue: Invalid data structure in %s: expected dict, got %s', 
-                           filename, type(data))
-                return None, None
-                
-            return msg, data
+            msg = pickle.load(fp, fix_imports=True, encoding='latin1')
+            data = pickle.load(fp, fix_imports=True, encoding='latin1')
         finally:
-            # Always clean up the lock file
-            try:
-                os.unlink(lockfile)
-            except OSError:
-                pass
+            fp.close()
+        if data.get('_parsemsg'):
+            msg = email.message_from_string(msg, Message)
+        # Add filebase to msgdata for cleanup
+        if data is not None:
+            data['filebase'] = filebase
+        return msg, data
 
     def finish(self, filebase, preserve=False):
         """Finish processing a file by either removing it or moving it to the shunt queue.

Makefile.in

@@ -74,6 +74,8 @@ PYTHON_FILES = $(shell find . -name "*.py")
 PYTHON_DIRS = $(shell find . -type d -name "Mailman")
 INSTALLED_SCRIPTS = $(shell find $(DESTDIR)$(prefix)/bin -type f -executable 2>/dev/null || true)
 SOURCE_SCRIPTS = $(shell find build/bin -type f -executable -name "*.py" 2>/dev/null || true)
+PYLINT = pylint
+PYLINT_FLAGS = --disable=C0111,C0103,C0303,W0311,W0603,W0621,R0903,R0913,R0914,R0915
 
 # Detect number of CPUs for parallel builds
 ifeq ($(shell uname -s),Darwin)
@@ -130,6 +132,19 @@ define check_lang_file
 	exit 1;
 endef
 
+# Add lint target
+.PHONY: lint
+lint:
+	@echo "Running pylint on installed Python files..."
+	@if [ -d "$(DESTDIR)$(prefix)" ]; then \
+		find $(DESTDIR)$(prefix) -name "*.py" -type f -print0 | \
+		xargs -0 $(PYLINT) $(PYLINT_FLAGS) || true; \
+	else \
+		echo "No installed files found at $(DESTDIR)$(prefix)"; \
+		echo "Please run 'make install' first"; \
+		exit 1; \
+	fi
+
 # Rules
 
 .PHONY: all build install clean distclean prepare-build clean-pyc doinstall update langpack