diff --git a/memos.py b/memos.py index 27767a0..5872ca3 100644 --- a/memos.py +++ b/memos.py @@ -30,9 +30,6 @@ PchumLog = logging.getLogger("pchumLogger") _valid_memo_msg_start = re.compile( r"^([A-Z]{3}):\s" ) -# Python 3 -QString = str - def delta2txt(d, format="pc"): if isinstance(d, mysteryTime): @@ -1439,7 +1436,7 @@ class PesterMemo(PesterConvo): irc_compatible=self.mainwindow.config.irc_compatibility_mode(), ) - @QtCore.pyqtSlot(QString) + @QtCore.pyqtSlot(str) def namesUpdated(self, channel): c = str(channel) if c.lower() != self.channel.lower(): @@ -1451,13 +1448,13 @@ class PesterMemo(PesterConvo): for n in self.mainwindow.namesdb[self.channel]: self.addUser(n) - @QtCore.pyqtSlot(QString, QString) + @QtCore.pyqtSlot(str, str) def modesUpdated(self, channel, modes): PchumLog.debug("modesUpdated(%s, %s)", channel, modes) if channel.lower() == self.channel.lower(): self.updateChanModes(modes, None) - @QtCore.pyqtSlot(QString) + @QtCore.pyqtSlot(str) def closeInviteOnly(self, channel): c = str(channel) if c.lower() == self.channel.lower(): @@ -1480,7 +1477,7 @@ class PesterMemo(PesterConvo): msgbox.setStandardButtons(QtWidgets.QMessageBox.StandardButton.Ok) msgbox.exec() - @QtCore.pyqtSlot(QString, QString) + @QtCore.pyqtSlot(str, str) def closeForbidden(self, channel, reason): c = str(channel) if c.lower() == self.channel.lower(): @@ -1571,7 +1568,7 @@ class PesterMemo(PesterConvo): self.mainwindow.chatlog.log(self.channel, msg) del self.netsplit - @QtCore.pyqtSlot(QString, QString, QString) + @QtCore.pyqtSlot(str, str, str) def userPresentChange(self, handle, channel, update): # print("handle: %s, channel: %s, update: %s" % (handle, channel, update)) h = str(handle) diff --git a/menus.py b/menus.py index 5a4e9bc..d51dfcb 100644 --- a/menus.py +++ b/menus.py @@ -19,7 +19,6 @@ from version import _pcVersion from convo import PesterInput, PesterText from parsetools import lexMessage -QString = str _datadir = ostools.getDataDir() # Logger PchumLog = logging.getLogger("pchumLogger") @@ -1815,7 +1814,7 @@ class PesterUserlist(QtWidgets.QDialog): self.searchbox = QtWidgets.QLineEdit(self) # self.searchbox.setStyleSheet(theme["convo/input/style"]) # which style is better? self.searchbox.setPlaceholderText("Search") - self.searchbox.textChanged["QString"].connect(self.updateUsers) + self.searchbox.textChanged[str].connect(self.updateUsers) self.label = QtWidgets.QLabel("USERLIST") self.userarea = RightClickList(self) @@ -1847,7 +1846,7 @@ class PesterUserlist(QtWidgets.QDialog): self.mainwindow.namesUpdated.connect(self.updateUsers) - self.mainwindow.userPresentSignal["QString", "QString", "QString"].connect( + self.mainwindow.userPresentSignal[str, str, str].connect( self.updateUserPresent ) self.updateUsers() @@ -1876,7 +1875,7 @@ class PesterUserlist(QtWidgets.QDialog): self.userarea.addItem(item) self.userarea.sortItems() - @QtCore.pyqtSlot(QString, QString, QString) + @QtCore.pyqtSlot(str, str, str) def updateUserPresent(self, handle, channel, update): h = str(handle) c = str(channel) @@ -1928,8 +1927,8 @@ class PesterUserlist(QtWidgets.QDialog): return self.pesterChum.emit(cur.text()) - addChum = QtCore.pyqtSignal("QString") - pesterChum = QtCore.pyqtSignal("QString") + addChum = QtCore.pyqtSignal(str) + pesterChum = QtCore.pyqtSignal(str) class MemoListItem(QtWidgets.QTreeWidgetItem): diff --git a/parsetools.py b/parsetools.py index cdf1d1f..3718938 100644 --- a/parsetools.py +++ b/parsetools.py @@ -24,7 +24,6 @@ PchumLog = logging.getLogger("pchumLogger") # I'll clean up the things that are no longer needed once the transition is # actually finished. -QString = str _ctag_begin = re.compile(r"(?i)") # _gtag_begin = re.compile(r"(?i)") @@ -829,7 +828,7 @@ def kxhandleInput(ctx, text=None, flavor=None, irc_compatible=False): # if ceased, rebegin if hasattr(ctx, "chumopen") and not ctx.chumopen: if not irc_compatible: - ctx.mainwindow.newConvoStarted.emit(QString(ctx.title()), True) + ctx.mainwindow.newConvoStarted.emit(str(ctx.title()), True) ctx.setChumOpen(True) # Post-process and send the messages. diff --git a/pesterchum.py b/pesterchum.py index b38c436..af70252 100755 --- a/pesterchum.py +++ b/pesterchum.py @@ -163,8 +163,6 @@ BOTNAMES.extend(SERVICES) _CONSOLE = False _CONSOLE_ENV = {} _CONSOLE_ENV["PAPP"] = None -# Python 3 -QString = str # Command line arguments _ARGUMENTS = parser.parse_args() @@ -1211,7 +1209,7 @@ class trollSlum(chumArea): # TypeError: connect() failed between triggered(bool) and unblockChumSignal() # I'm not sure why this was here in the first place- # Does removing it break anything else...? - # unblockChumSignal = QtCore.pyqtSignal('QString') + # unblockChumSignal = QtCore.pyqtSignal(str) class TrollSlumWindow(QtWidgets.QFrame): @@ -1707,7 +1705,7 @@ class PesterWindow(MovingWindow): # We probably tried to interact with a call not available on this kernel. PchumLog.exception("") - @QtCore.pyqtSlot(QString, QString) + @QtCore.pyqtSlot(str, str) def updateMsg(self, ver, url): if not hasattr(self, "updatemenu"): self.updatemenu = None @@ -2032,13 +2030,13 @@ class PesterWindow(MovingWindow): ) convoWindow.windowClosed[str].connect(self.closeConvo) self.convos[chum.handle] = convoWindow - if chum.handle.upper() in BOTNAMES or self.config.irc_compatibility_mode(): + if chum.handle.upper() in BOTNAMES: convoWindow.toggleQuirks(True) convoWindow.quirksOff.setChecked(True) - if str(chum.handle).upper() in CUSTOMBOTS: - self.newConvoStarted.emit(QString(chum.handle), initiated) + if not self.config.irc_compatibility_mode() or chum.handle.upper() in CUSTOMBOTS: + self.newConvoStarted.emit(chum.handle, initiated) else: - self.newConvoStarted.emit(QString(chum.handle), initiated) + self.newConvoStarted.emit(chum.handle, initiated) convoWindow.show() def createTabWindow(self): @@ -2608,7 +2606,7 @@ class PesterWindow(MovingWindow): chum.color = color self.newConversation(chum) - @QtCore.pyqtSlot(QString) + @QtCore.pyqtSlot(str) def closeConvo(self, handle): h = str(handle) try: @@ -2633,7 +2631,7 @@ class PesterWindow(MovingWindow): self.chatlog.finish(h) del self.convos[h] - @QtCore.pyqtSlot(QString) + @QtCore.pyqtSlot(str) def closeMemo(self, channel): c = str(channel) self.chatlog.finish(c) @@ -2656,28 +2654,28 @@ class PesterWindow(MovingWindow): del self.tabmemo self.tabmemo = None - @QtCore.pyqtSlot(QString, Mood) + @QtCore.pyqtSlot(str, Mood) def updateMoodSlot(self, handle, mood): h = str(handle) self.updateMood(h, mood) - @QtCore.pyqtSlot(QString, QtGui.QColor) + @QtCore.pyqtSlot(str, QtGui.QColor) def updateColorSlot(self, handle, color): PchumLog.debug("updateColorSlot(%s, %s)", handle, color) self.changeColor(handle, color) - @QtCore.pyqtSlot(QString, QString) + @QtCore.pyqtSlot(str, str) def deliverMessage(self, handle, msg): h = str(handle) m = str(msg) self.newMessage(h, m) - @QtCore.pyqtSlot(QString, QString, QString) + @QtCore.pyqtSlot(str, str, str) def deliverMemo(self, chan, handle, msg): (c, h, m) = (str(chan), str(handle), str(msg)) self.newMemoMsg(c, h, m) - @QtCore.pyqtSlot(QString, QString) + @QtCore.pyqtSlot(str, str) def deliverNotice(self, handle, msg): h = str(handle) m = str(msg) @@ -2710,7 +2708,7 @@ class PesterWindow(MovingWindow): t = self.tm.Toast("%s:" % h, m) t.show() - @QtCore.pyqtSlot(QString, QString) + @QtCore.pyqtSlot(str, str) def deliverInvite(self, handle, channel): msgbox = QtWidgets.QMessageBox() msgbox.setText("You're invited!") @@ -2739,25 +2737,25 @@ class PesterWindow(MovingWindow): if ret == QtWidgets.QMessageBox.StandardButton.Ok: self.newMemo(str(channel), "+0:00") - @QtCore.pyqtSlot(QString) + @QtCore.pyqtSlot(str) def chanInviteOnly(self, channel): self.inviteOnlyChan.emit(channel) - @QtCore.pyqtSlot(QString, QString) + @QtCore.pyqtSlot(str, str) def cannotSendToChan(self, channel, msg): self.deliverMemo(channel, "ChanServ", msg) # Unused and redefined. - # @QtCore.pyqtSlot(QString, QString) + # @QtCore.pyqtSlot(str, str) # def modesUpdated(self, channel, modes): # self.modesUpdated.emit(channel, modes) - @QtCore.pyqtSlot(QString, QString, QString) + @QtCore.pyqtSlot(str, str, str) def timeCommand(self, chan, handle, command): (c, h, cmd) = (str(chan), str(handle), str(command)) if self.memos[c]: self.memos[c].timeUpdate(h, cmd) - @QtCore.pyqtSlot(QString, QString, QString) + @QtCore.pyqtSlot(str, str, str) def quirkDisable(self, channel, msg, op): (c, msg, op) = (str(channel), str(msg), str(op)) if c not in self.memos: @@ -2765,7 +2763,7 @@ class PesterWindow(MovingWindow): memo = self.memos[c] memo.quirkDisable(op, msg) - @QtCore.pyqtSlot(QString, PesterList) + @QtCore.pyqtSlot(str, PesterList) def updateNames(self, channel, names): c = str(channel) # update name DB @@ -2773,7 +2771,7 @@ class PesterWindow(MovingWindow): # warn interested party of names self.namesUpdated.emit(c) - @QtCore.pyqtSlot(QString, QString, QString) + @QtCore.pyqtSlot(str, str, str) def userPresentUpdate(self, handle, channel, update): c = str(channel) n = str(handle) @@ -2861,7 +2859,7 @@ class PesterWindow(MovingWindow): self.addChum(chum) self.addchumdialog = None - @QtCore.pyqtSlot(QString) + @QtCore.pyqtSlot(str) def removeChum(self, chumlisting): self.config.removeChum(chumlisting) @@ -2874,7 +2872,7 @@ class PesterWindow(MovingWindow): if ok: self.sendMessage.emit("REPORT {} {}".format(handle, reason), "calSprite") - @QtCore.pyqtSlot(QString) + @QtCore.pyqtSlot(str) def blockChum(self, handle): h = str(handle) self.config.addBlocklist(h) @@ -2897,7 +2895,7 @@ class PesterWindow(MovingWindow): if not self.config.irc_compatibility_mode(): self.blockedChum.emit(handle) - @QtCore.pyqtSlot(QString) + @QtCore.pyqtSlot(str) def unblockChum(self, handle): h = str(handle) self.config.delBlocklist(h) @@ -3103,13 +3101,13 @@ class PesterWindow(MovingWindow): self.requestNames.emit("#pesterchum") self.allusers.show() - @QtCore.pyqtSlot(QString) + @QtCore.pyqtSlot(str) def userListAdd(self, handle): h = str(handle) chum = PesterProfile(h, chumdb=self.chumdb) self.addChum(chum) - @QtCore.pyqtSlot(QString) + @QtCore.pyqtSlot(str) def userListPester(self, handle): h = str(handle) self.newConversation(h) @@ -3724,7 +3722,7 @@ class PesterWindow(MovingWindow): ) ) - @QtCore.pyqtSlot(QString, QString) + @QtCore.pyqtSlot(str, str) def nickCollision(self, handle, tmphandle): if hasattr(self, "loadingscreen"): if self.loadingscreen is not None: @@ -3747,7 +3745,7 @@ class PesterWindow(MovingWindow): h = str(handle) self.changeProfile(collision=h) - @QtCore.pyqtSlot(QString, QString) + @QtCore.pyqtSlot(str, str) def getSvsnickedOn(self, oldhandle, newhandle): if hasattr(self, "loadingscreen"): if self.loadingscreen is not None: @@ -3765,7 +3763,7 @@ class PesterWindow(MovingWindow): if not self.chooseprofile: self.changeProfile(svsnick=(oldhandle, newhandle)) - @QtCore.pyqtSlot(QString) + @QtCore.pyqtSlot(str) def myHandleChanged(self, handle): # Update nick in channels for memo in self.memos.keys(): @@ -3800,7 +3798,7 @@ class PesterWindow(MovingWindow): # msg.setStyleSheet("QMessageBox{" + self.theme["main/defaultwindow/style"] + "}") msg.exec() - @QtCore.pyqtSlot(QString, QString) + @QtCore.pyqtSlot(str, str) def forbiddenchannel(self, channel, reason): self.forbiddenChan.emit(channel, reason)