Fix DeprecationWarning: Removed Gdk.threads_enter/leave calls

Author: dk8877

asyncipp.py

@@ -175,13 +175,11 @@ def stop (self):
 
     def _auth (self, prompt, conn=None, method=None, resource=None):
         def prompt_auth (prompt):
-            Gdk.threads_enter ()
             if conn is None:
                 self._auth_handler (prompt, self._conn)
             else:
                 self._auth_handler (prompt, self._conn, method, resource)
 
-            Gdk.threads_leave ()
             return False
 
         if self._auth_handler is None:
@@ -194,9 +192,7 @@ def prompt_auth (prompt):
     def _reply (self, result):
         def send_reply (handler, result):
             if not self._destroyed:
-                Gdk.threads_enter ()
                 handler (self._conn, result)
-                Gdk.threads_leave ()
             return False
 
         if not self._destroyed and self._reply_handler:
@@ -205,9 +201,7 @@ def send_reply (handler, result):
     def _error (self, exc):
         def send_error (handler, exc):
             if not self._destroyed:
-                Gdk.threads_enter ()
                 handler (self._conn, exc)
-                Gdk.threads_leave ()
             return False
 
         if not self._destroyed and self._error_handler:

asyncpk1.py

@@ -110,17 +110,9 @@ def _pk_reply_handler (self, error, *args):
             return
 
         if str (error) == '':
-            try:
-                Gdk.threads_enter ()
-            except:
-                pass
             debugprint ("%s: no error, calling reply handler %s" %
                         (self, self._client_reply_handler))
             self._client_reply_handler (self._conn, self._unpack_fn (*args))
-            try:
-                Gdk.threads_leave ()
-            except:
-                pass
             self._destroy ()
             return
 
@@ -133,17 +125,9 @@ def _pk_error_handler (self, exc):
 
         if exc.get_dbus_name () == CUPS_PK_NEED_AUTH:
             exc = cups.IPPError (cups.IPP_NOT_AUTHORIZED, 'pkcancel')
-            try:
-                Gdk.threads_enter ()
-            except:
-                pass
             debugprint ("%s: no auth, calling error handler %s" %
-                        (self, self._client_error_handler))
+                                    (self, self._client_error_handler))
             self._client_error_handler (self._conn, exc)
-            try:
-                Gdk.threads_leave ()
-            except:
-                pass
             self._destroy ()
             return
 

authconn.py

@@ -302,9 +302,6 @@ def _authloop (self, fname, fn, *args, **kwds):
         return result
 
     def _ask_retry_server_error (self, message):
-        if self._lock:
-            Gdk.threads_enter ()
-
         try:
             msg = (_("CUPS server error (%s)") % self._operation_stack[0])
         except IndexError:
@@ -323,7 +320,6 @@ def _ask_retry_server_error (self, message):
         d.set_default_response (Gtk.ResponseType.OK)
         if self._lock:
             d.connect ("response", self._on_retry_server_error_response)
-            Gdk.threads_leave ()
         else:
             self._retry_response = d.run ()
             d.destroy ()
@@ -449,12 +445,10 @@ def _perform_authentication (self):
         return 1
 
     def _show_not_authorized_dialog (self):
-        if self._lock:
-            Gdk.threads_enter ()
         d = Gtk.MessageDialog (transient_for=self._parent,
-                               modal=True, destroy_with_parent=True,
-                               message_type=Gtk.MessageType.ERROR,
-                               buttons=Gtk.ButtonsType.CLOSE)
+                            modal=True, destroy_with_parent=True,
+                            message_type=Gtk.MessageType.ERROR,
+                            buttons=Gtk.ButtonsType.CLOSE)
         d.set_title (_("Not authorized"))
         d.set_markup ('<span weight="bold" size="larger">' +
                       _("Not authorized") + '</span>\n\n' +
@@ -463,7 +457,6 @@ def _show_not_authorized_dialog (self):
             d.connect ("response", self._on_not_authorized_dialog_response)
             d.show_all ()
             d.show_now ()
-            Gdk.threads_leave ()
         else:
             d.run ()
             d.destroy ()
@@ -473,9 +466,6 @@ def _on_not_authorized_dialog_response (self, dialog, response):
         dialog.destroy ()
 
     def _perform_authentication_with_dialog (self):
-        if self._lock:
-            Gdk.threads_enter ()
-
         # Prompt.
         if len (self._operation_stack) > 0:
             try:
@@ -497,7 +487,6 @@ def _perform_authentication_with_dialog (self):
         self._dialog_shown = True
         if self._lock:
             d.connect ("response", self._on_authentication_response)
-            Gdk.threads_leave ()
         else:
             response = d.run ()
             self._on_authentication_response (d, response)

cupshelpers/openprinting.py

@@ -448,24 +448,18 @@ def search_printers_callback (self, status, user_data, printers):
             text = ""
             for printer in printers.values ():
                 text += printer + "\n"
-            Gdk.threads_enter ()
             self.tv.get_buffer ().set_text (text)
-            Gdk.threads_leave ()
 
         def list_drivers_callback (self, status, user_data, drivers):
             if status != 0:
                 raise drivers[1]
 
             text = pprint.pformat (drivers)
-            Gdk.threads_enter ()
             self.tv.get_buffer ().set_text (text)
-            Gdk.threads_leave ()
 
         def query_callback (self, status, user_data, result):
-            Gdk.threads_enter ()
             self.tv.get_buffer ().set_text (str (result))
             open ("result.xml", "w").write (str (result))
-            Gdk.threads_leave ()
 
     q = QueryApp()
     Gtk.main ()

gtkinklevel.py

@@ -116,13 +116,11 @@ def draw (self, widget, ctx):
     from gi.repository import GLib
     import time
     def adjust_level (level):
-        Gdk.threads_enter ()
         l = level.get_level ()
         l += 1
         if l > 100:
             l = 0
         level.set_level (l)
-        Gdk.threads_leave ()
         return True
 
     w = Gtk.Window ()

jobviewer.py

@@ -816,9 +816,7 @@ def update_job_creation_times(self):
 
         if need_update and not self.job_creation_times_timer:
             def update_times_with_locking ():
-                Gdk.threads_enter ()
                 ret = self.update_job_creation_times ()
-                Gdk.threads_leave ()
                 return ret
 
             t = GLib.timeout_add_seconds (60, update_times_with_locking)
@@ -873,9 +871,7 @@ def add_job (self, job, data, connection=None):
 
         if not self.job_creation_times_timer:
             def start_updating_job_creation_times():
-                Gdk.threads_enter ()
                 self.update_job_creation_times ()
-                Gdk.threads_leave ()
                 return False
 
             GLib.timeout_add (500, start_updating_job_creation_times)
@@ -1797,7 +1793,6 @@ def update_status (self, have_jobs=None):
             self.worst_reason = worst_reason
             debugprint ("Worst reason: %s" % worst_reason)
 
-        Gdk.threads_enter ()
         self.statusbar.pop (0)
         if self.worst_reason is not None:
             (title, tooltip) = self.worst_reason.get_description ()
@@ -1826,8 +1821,6 @@ def update_status (self, have_jobs=None):
             self.set_statusicon_visibility ()
             self.set_statusicon_tooltip (tooltip=tooltip)
 
-        Gdk.threads_leave ()
-
     ## Notifications
     def notify_printer_state_reason_if_important (self, reason):
         level = reason.get_level ()

newprinter.py

@@ -1744,19 +1744,32 @@ def opreq_id_search_done (self, opreq, printers, drivers):
         for handler in self.opreq_handlers:
             opreq.disconnect (handler)
 
-        Gdk.threads_enter ()
+    self.opreq_user_search = False
+    self.opreq_handlers = None
+    self.opreq = None
+    self._searchdialog.hide ()
+    self._searchdialog.destroy ()
+    self._searchdialog = None
+
+    # Check whether we have found something
+    if len (printers) < 1:
+        # No.
+        ready (self.NewPrinterWindow)
 
-        try:
-            self.opreq_user_search = False
-            self.opreq_handlers = None
-            self.opreq = None
-            self._searchdialog.hide ()
-            self._searchdialog.destroy ()
-            self._searchdialog = None
+        self.founddownloadabledrivers = False
+        if self.dialog_mode == "download_driver":
+            self.on_NPCancel(None)
+        else:
+            self.nextNPTab ()
+    else:
+        self.downloadable_printers = printers
+        self.downloadable_drivers = drivers
+        self.founddownloadabledrivers = True
 
-            # Check whether we have found something
-            if len (printers) < 1:
-                # No.
+        try:
+            self.NewPrinterWindow.show()
+            self.setNPButtons()
+            if not self.fillDownloadableDrivers():
                 ready (self.NewPrinterWindow)
 
                 self.founddownloadabledrivers = False
@@ -1765,36 +1778,17 @@ def opreq_id_search_done (self, opreq, printers, drivers):
                 else:
                     self.nextNPTab ()
             else:
-                self.downloadable_printers = printers
-                self.downloadable_drivers = drivers
-                self.founddownloadabledrivers = True
-
-                try:
-                    self.NewPrinterWindow.show()
-                    self.setNPButtons()
-                    if not self.fillDownloadableDrivers():
-                        ready (self.NewPrinterWindow)
-
-                        self.founddownloadabledrivers = False
-                        if self.dialog_mode == "download_driver":
-                            self.on_NPCancel(None)
-                        else:
-                            self.nextNPTab ()
-                    else:
-                        if self.dialog_mode == "download_driver":
-                            self.nextNPTab (step = 0)
-                        else:
-                            self.nextNPTab ()
-                except:
-                    nonfatalException ()
+                if self.dialog_mode == "download_driver":
+                    self.nextNPTab (step = 0)
+                else:
                     self.nextNPTab ()
-
-        finally:
-            Gdk.threads_leave ()
+        except:
+            nonfatalException ()
+            self.nextNPTab ()
 
     def opreq_id_search_error (self, opreq, status, err):
         debugprint ("OpenPrinting request failed (%d): %s" % (status,
-                                                              repr (err)))
+                                                        repr (err)))
         self.opreq_id_search_done (opreq, list(), dict())
 
 
@@ -3488,7 +3482,6 @@ def found_callback (new_device):
         self.printer_finder = finder
 
     def found_network_printer_callback (self, new_device):
-        Gdk.threads_enter ()
         if new_device:
             self.network_found += 1
             dev = PhysicalDevice (new_device)
@@ -3530,7 +3523,6 @@ def found_network_printer_callback (self, new_device):
                                                           "address.") + '</i>')
                 self.lblNetworkFindNotFound.show ()
 
-        Gdk.threads_leave ()
     ###
 
     def getDeviceURI(self):
@@ -3674,7 +3666,6 @@ def opreq_user_search_done (self, opreq, printers, drivers):
 
         button = self.btnNPDownloadableDriverSearch
         label = self.btnNPDownloadableDriverSearch_label
-        Gdk.threads_enter ()
         try:
             label.set_text (_("Search"))
             button.set_sensitive (True)
@@ -3710,8 +3701,6 @@ def opreq_user_search_done (self, opreq, printers, drivers):
         except:
             nonfatalException()
 
-        Gdk.threads_leave ()
-
     def opreq_user_search_error (self, opreq, status, err):
         debugprint ("OpenPrinting request failed (%d): %s" % (status,
                                                               repr (err)))

ppdcache.py

@@ -175,9 +175,7 @@ def _connected (self, connection, exc):
 
     def _schedule_callback (self, callback, name, result, exc):
         def cb_func (callback, name, result, exc):
-            Gdk.threads_enter ()
             callback (name, result, exc)
-            Gdk.threads_leave ()
             return False
 
         GLib.idle_add (cb_func, callback, name, result, exc)

probe_printer.py

@@ -207,9 +207,7 @@ def __init__ (self, *args, **kwargs):
         pysmb.AuthContext.__init__ (self, *args, **kwargs)
 
     def _do_perform_authentication (self):
-        Gdk.threads_enter ()
         result = pysmb.AuthContext.perform_authentication (self)
-        Gdk.threads_leave ()
         self._do_perform_authentication_result = result
         self._gui_event.set ()
 

scp-dbus-service.py

@@ -429,11 +429,9 @@ class ConfigPrintingJobApplet(dbus.service.Object):
     def __init__ (self, bus, path):
         bus_name = dbus.service.BusName (CONFIG_BUS, bus=bus)
         dbus.service.Object.__init__ (self, bus_name=bus_name, object_path=path)
-        Gdk.threads_enter ()
         self.jobapplet = jobviewer.JobViewer(bus=dbus.SystemBus (),
                                              applet=True, my_jobs=True)
         self.jobapplet.set_process_pending (False)
-        Gdk.threads_leave ()
         handle = self.jobapplet.connect ('finished', self.on_jobapplet_finished)
         self.finished_handle = handle
         self.has_finished = False
@@ -599,7 +597,5 @@ def on_added(name, path=None):
     debugprint ("Service running...")
     g_killtimer = killtimer.KillTimer (killfunc=Gtk.main_quit)
     cp = ConfigPrinting ()
-    Gdk.threads_enter ()
     Gtk.main ()
-    Gdk.threads_leave ()
     cp.destroy ()