From 466d3a42f137db9421e887186641689307822205 Mon Sep 17 00:00:00 2001
From: Ben Kurtovic <ben.kurtovic@gmail.com>
Date: Mon, 18 Feb 2019 21:26:03 -0500
Subject: [PATCH] copyvios: Minor refactor for cleaner stack frames.

---
 earwigbot/wiki/copyvios/parsers.py |  2 +-
 earwigbot/wiki/copyvios/workers.py | 44 ++++++++++++++++++++++----------------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/earwigbot/wiki/copyvios/parsers.py b/earwigbot/wiki/copyvios/parsers.py
index 2a4022f..6cf03ef 100644
--- a/earwigbot/wiki/copyvios/parsers.py
+++ b/earwigbot/wiki/copyvios/parsers.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8  -*-
 #
-# Copyright (C) 2009-2015 Ben Kurtovic <ben.kurtovic@gmail.com>
+# Copyright (C) 2009-2019 Ben Kurtovic <ben.kurtovic@gmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/earwigbot/wiki/copyvios/workers.py b/earwigbot/wiki/copyvios/workers.py
index 2872df0..f23bb5f 100644
--- a/earwigbot/wiki/copyvios/workers.py
+++ b/earwigbot/wiki/copyvios/workers.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8  -*-
 #
-# Copyright (C) 2009-2016 Ben Kurtovic <ben.kurtovic@gmail.com>
+# Copyright (C) 2009-2019 Ben Kurtovic <ben.kurtovic@gmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -203,6 +203,28 @@ class _CopyvioWorker(object):
         self._queues.lock.release()
         return source
 
+    def _handle_once(self):
+        """Handle a single source from one of the queues."""
+        try:
+            source = self._dequeue()
+        except Empty:
+            self._logger.debug("Exiting: queue timed out")
+            return False
+        except StopIteration:
+            self._logger.debug("Exiting: got stop signal")
+            return False
+
+        try:
+            text = self._open_url(source)
+        except ParserExclusionError:
+            self._logger.debug("Source excluded by content parser")
+            source.skipped = source.excluded = True
+            source.finish_work()
+        else:
+            chain = MarkovChain(text) if text else None
+            source.workspace.compare(source, chain)
+        return True
+
     def _run(self):
         """Main entry point for the worker thread.
 
@@ -211,24 +233,8 @@ class _CopyvioWorker(object):
         now empty.
         """
         while True:
-            try:
-                source = self._dequeue()
-            except Empty:
-                self._logger.debug("Exiting: queue timed out")
-                return
-            except StopIteration:
-                self._logger.debug("Exiting: got stop signal")
-                return
-
-            try:
-                text = self._open_url(source)
-            except ParserExclusionError:
-                self._logger.debug("Source excluded by content parser")
-                source.skipped = source.excluded = True
-                source.finish_work()
-            else:
-                chain = MarkovChain(text) if text else None
-                source.workspace.compare(source, chain)
+            if not self._handle_once():
+                break
 
     def start(self):
         """Start the copyvio worker in a new thread."""