diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml index a9be522..89d3c25 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/black.yml @@ -1,7 +1,5 @@ name: Black - -on: [push, pull_request] - +on: push jobs: black: runs-on: ubuntu-latest diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml new file mode 100644 index 0000000..9856069 --- /dev/null +++ b/.github/workflows/pylint.yml @@ -0,0 +1,20 @@ +name: Pylint +on: push +jobs: + pylint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Setup Python 3.10 x64 + uses: actions/setup-python@v4 + with: + python-version: '3.10' + architecture: 'x64' + - name: Install Dependencies + run: python3 -m pip install PyQt6 certifi PyInstaller + - name: Install Pylint + run: python3 -m pip install --pre pylint + - name: Run Pylint + run: | + cd .. + PYLINTRC=pesterchum-alt-servers/.pylintrc python -m pylint --recursive=y pesterchum-alt-servers diff --git a/.pylintrc b/.pylintrc new file mode 100644 index 0000000..7b533cd --- /dev/null +++ b/.pylintrc @@ -0,0 +1,601 @@ +[MAIN] + +# Analyse import fallback blocks. This can be used to support both Python 2 and +# 3 compatible code, which means that the block might have code that exists +# only in one or another interpreter, leading to false positives when analysed. +analyse-fallback-blocks=no + +# Load and enable all available extensions. Use --list-extensions to see a list +# all available extensions. +#enable-all-extensions= + +# In error mode, checkers without error messages are disabled and for others, +# only the ERROR messages are displayed, and no reports are done by default. +errors-only= + +# Always return a 0 (non-error) status code, even if lint errors are found. +# This is primarily useful in continuous integration scripts. +#exit-zero= + +# A comma-separated list of package or module names from where C extensions may +# be loaded. Extensions are loading into the active Python interpreter and may +# run arbitrary code. +extension-pkg-allow-list= + +# A comma-separated list of package or module names from where C extensions may +# be loaded. Extensions are loading into the active Python interpreter and may +# run arbitrary code. (This is an alternative name to extension-pkg-allow-list +# for backward compatibility.) +extension-pkg-whitelist= + +# Return non-zero exit code if any of these messages/categories are detected, +# even if score is above --fail-under value. Syntax same as enable. Messages +# specified are enabled, while categories only check already-enabled messages. +fail-on=E,F + +# Specify a score threshold to be exceeded before program exits with error. +#fail-under=6 + +# Interpret the stdin as a python script, whose filename needs to be passed as +# the module_or_package argument. +#from-stdin= + +# Files or directories to be skipped. They should be base names, not paths. +ignore=CVS + +# Add files or directories matching the regex patterns to the ignore-list. The +# regex matches against paths and can be in Posix or Windows format. +ignore-paths= + +# Files or directories matching the regex patterns are skipped. The regex +# matches against base names, not paths. The default value ignores Emacs file +# locks +ignore-patterns=^\.# + +# List of module names for which member attributes should not be checked +# (useful for modules/projects where namespaces are manipulated during runtime +# and thus existing member attributes cannot be deduced by static analysis). It +# supports qualified module names, as well as Unix pattern matching. +ignored-modules= + +# Python code to execute, usually for sys.path manipulation such as +# pygtk.require(). +#init-hook= + +# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the +# number of processors available to use. +jobs=1 + +# Control the amount of potential inferred values when inferring a single +# object. This can help the performance when dealing with large functions or +# complex, nested conditions. +limit-inference-results=100 + +# List of plugins (as comma separated values of python module names) to load, +# usually to register additional checkers. +load-plugins= + +# Pickle collected data for later comparisons. +persistent=yes + +# Minimum Python version to use for version dependent checks. Will default to +# the version used to run pylint. +py-version=3.8 + +# Discover python modules and packages in the file system subtree. +recursive=no + +# When enabled, pylint would attempt to guess common misconfiguration and emit +# user-friendly hints instead of false-positive error messages. +suggestion-mode=yes + +# Allow loading of arbitrary C extensions. Extensions are imported into the +# active Python interpreter and may run arbitrary code. +unsafe-load-any-extension=no + +# In verbose mode, extra non-checker-related info will be displayed. +#verbose= + + +[REPORTS] + +# Python expression which should return a score less than or equal to 10. You +# have access to the variables 'fatal', 'error', 'warning', 'refactor', +# 'convention', and 'info' which contain the number of messages in each +# category, as well as 'statement' which is the total number of statements +# analyzed. This score is used by the global evaluation report (RP0004). +evaluation=max(0, 0 if fatal else 10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)) + +# Template used to display messages. This is a python new-style format string +# used to format the message information. See doc for all details. +msg-template= + +# Set the output format. Available formats are text, parseable, colorized, json +# and msvs (visual studio). You can also give a reporter class, e.g. +# mypackage.mymodule.MyReporterClass. +#output-format= + +# Tells whether to display a full report or only the messages. +reports=yes + +# Activate the evaluation score. +score=no + + +[MESSAGES CONTROL] + +# Only show warnings with the listed confidence levels. Leave empty to show +# all. Valid levels: HIGH, CONTROL_FLOW, INFERENCE, INFERENCE_FAILURE, +# UNDEFINED. +confidence=HIGH, + CONTROL_FLOW, + INFERENCE, + INFERENCE_FAILURE, + UNDEFINED + +# Disable the message, report, category or checker with the given id(s). You +# can either give multiple identifiers separated by comma (,) or put this +# option multiple times (only on the command line, not in the configuration +# file where it should appear only once). You can also use "--disable=all" to +# disable everything first and then re-enable specific checks. For example, if +# you want to run only the similarities checker, you can use "--disable=all +# --enable=similarities". If you want to run only the classes checker, but have +# no Warning level messages displayed, use "--disable=all --enable=classes +# --disable=W". +#disable=all + +# Enable the message, report, category or checker with the given id(s). You can +# either give multiple identifier separated by comma (,) or put this option +# multiple time (only on the command line, not in the configuration file where +# it should appear only once). See also the "--disable" option for examples. +#enable=F,E,W + + +[CLASSES] + +# Warn about protected attribute access inside special methods +check-protected-access-in-special-methods=no + +# List of method names used to declare (i.e. assign) instance attributes. +#defining-attr-methods=__init__, +# __new__, +# setUp, +# __post_init__ + +# List of member names, which should be excluded from the protected access +# warning. +exclude-protected=_asdict, + _fields, + _replace, + _source, + _make + +# List of valid names for the first argument in a class method. +valid-classmethod-first-arg=cls + +# List of valid names for the first argument in a metaclass class method. +valid-metaclass-classmethod-first-arg=cls + + +[FORMAT] + +# Expected format of line ending, e.g. empty (any line ending), LF or CRLF. +expected-line-ending-format= + +# Regexp for a line that is allowed to be longer than the limit. +ignore-long-lines=^\s*(# )??$ + +# Number of spaces of indent required inside a hanging or continued line. +indent-after-paren=4 + +# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 +# tab). +indent-string=' ' + +# Maximum number of characters on a single line. +max-line-length=100 + +# Maximum number of lines in a module. +max-module-lines=1000 + +# Allow the body of a class to be on the same line as the declaration if body +# contains single statement. +single-line-class-stmt=no + +# Allow the body of an if to be on the same line as the test if there is no +# else. +single-line-if-stmt=no + + +[SPELLING] + +# Limits count of emitted suggestions for spelling mistakes. +max-spelling-suggestions=4 + +# Spelling dictionary name. Available dictionaries: none. To make it work, +# install the 'python-enchant' package. +spelling-dict= + +# List of comma separated words that should be considered directives if they +# appear at the beginning of a comment and should not be checked. +spelling-ignore-comment-directives=fmt: on,fmt: off,noqa:,noqa,nosec,isort:skip,mypy: + +# List of comma separated words that should not be checked. +spelling-ignore-words= + +# A path to a file that contains the private dictionary; one word per line. +spelling-private-dict-file= + +# Tells whether to store unknown words to the private dictionary (see the +# --spelling-private-dict-file option) instead of raising a message. +spelling-store-unknown-words=no + + +[LOGGING] + +# The type of string formatting that logging methods do. `old` means using % +# formatting, `new` is for `{}` formatting. +logging-format-style=old + +# Logging modules to check that the string format arguments are in logging +# function parameter format. +logging-modules=logging + + +[SIMILARITIES] + +# Comments are removed from the similarity computation +ignore-comments=yes + +# Docstrings are removed from the similarity computation +ignore-docstrings=yes + +# Imports are removed from the similarity computation +ignore-imports=yes + +# Signatures are removed from the similarity computation +ignore-signatures=yes + +# Minimum lines number of a similarity. +min-similarity-lines=4 + + +[EXCEPTIONS] + +# Exceptions that will emit a warning when caught. +#overgeneral-exceptions=BaseException, +# Exception + + +[MISCELLANEOUS] + +# List of note tags to take in consideration, separated by a comma. +notes=FIXME, + XXX, + TODO + +# Regular expression of note tags to take in consideration. +notes-rgx= + + +[VARIABLES] + +# List of additional names supposed to be defined in builtins. Remember that +# you should avoid defining new builtins when possible. +additional-builtins= + +# Tells whether unused global variables should be treated as a violation. +allow-global-unused-variables=yes + +# List of names allowed to shadow builtins +allowed-redefined-builtins= + +# List of strings which can identify a callback function by name. A callback +# name must start or end with one of those strings. +callbacks=cb_, + _cb + +# A regular expression matching the name of dummy variables (i.e. expected to +# not be used). +dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_ + +# Argument names that match this expression will be ignored. Default to name +# with leading underscore. +ignored-argument-names=_.*|^ignored_|^unused_ + +# Tells whether we should check for unused import in __init__ files. +init-import=no + +# List of qualified module names which can have objects that can redefine +# builtins. +redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io + + +[DESIGN] + +# List of regular expressions of class ancestor names to ignore when counting +# public methods (see R0903) +exclude-too-few-public-methods= + +# List of qualified class names to ignore when counting class parents (see +# R0901) +ignored-parents= + +# Maximum number of arguments for function / method. +max-args=5 + +# Maximum number of attributes for a class (see R0902). +max-attributes=7 + +# Maximum number of boolean expressions in an if statement (see R0916). +max-bool-expr=5 + +# Maximum number of branch for function / method body. +max-branches=12 + +# Maximum number of locals for function / method body. +max-locals=15 + +# Maximum number of parents for a class (see R0901). +max-parents=7 + +# Maximum number of public methods for a class (see R0904). +max-public-methods=20 + +# Maximum number of return / yield for function / method body. +max-returns=6 + +# Maximum number of statements in function / method body. +max-statements=50 + +# Minimum number of public methods for a class (see R0903). +min-public-methods=2 + + +[IMPORTS] + +# List of modules that can be imported at any level, not just the top level +# one. +allow-any-import-level= + +# Allow wildcard imports from modules that define __all__. +allow-wildcard-with-all=no + +# Deprecated modules which should not be used, separated by a comma. +deprecated-modules= + +# Output a graph (.gv or any supported image format) of external dependencies +# to the given file (report RP0402 must not be disabled). +ext-import-graph= + +# Output a graph (.gv or any supported image format) of all (i.e. internal and +# external) dependencies to the given file (report RP0402 must not be +# disabled). +import-graph= + +# Output a graph (.gv or any supported image format) of internal dependencies +# to the given file (report RP0402 must not be disabled). +int-import-graph= + +# Force import order to recognize a module as part of the standard +# compatibility libraries. +known-standard-library= + +# Force import order to recognize a module as part of a third party library. +known-third-party=enchant + +# Couples of modules and preferred modules, separated by a comma. +preferred-modules= + + +[TYPECHECK] + +# List of decorators that produce context managers, such as +# contextlib.contextmanager. Add to this list to register other decorators that +# produce valid context managers. +contextmanager-decorators=contextlib.contextmanager + +# List of members which are set dynamically and missed by pylint inference +# system, and so shouldn't trigger E1101 when accessed. Python regular +# expressions are accepted. +generated-members= + +# Tells whether to warn about missing members when the owner of the attribute +# is inferred to be None. +ignore-none=yes + +# This flag controls whether pylint should warn about no-member and similar +# checks whenever an opaque object is returned when inferring. The inference +# can return multiple potential results while evaluating a Python object, but +# some branches might not be evaluated, which results in partial inference. In +# that case, it might be useful to still emit no-member and other checks for +# the rest of the inferred objects. +ignore-on-opaque-inference=yes + +# List of symbolic message names to ignore for Mixin members. +ignored-checks-for-mixins=no-member, + not-async-context-manager, + not-context-manager, + attribute-defined-outside-init + +# List of class names for which member attributes should not be checked (useful +# for classes with dynamically set attributes). This supports the use of +# qualified names. +ignored-classes=optparse.Values,thread._local,_thread._local,argparse.Namespace + +# Show a hint with possible names when a member name was not found. The aspect +# of finding the hint is based on edit distance. +missing-member-hint=yes + +# The minimum edit distance a name should have in order to be considered a +# similar match for a missing member name. +missing-member-hint-distance=1 + +# The total number of similar names that should be taken in consideration when +# showing a hint for a missing member. +missing-member-max-choices=1 + +# Regex pattern to define which classes are considered mixins. +mixin-class-rgx=.*[Mm]ixin + +# List of decorators that change the signature of a decorated function. +signature-mutators= + + +[STRING] + +# This flag controls whether inconsistent-quotes generates a warning when the +# character used as a quote delimiter is used inconsistently within a module. +check-quote-consistency=no + +# This flag controls whether the implicit-str-concat should generate a warning +# on implicit string concatenation in sequences defined over several lines. +check-str-concat-over-line-jumps=no + + +[BASIC] + +# Naming style matching correct argument names. +argument-naming-style=snake_case + +# Regular expression matching correct argument names. Overrides argument- +# naming-style. If left empty, argument names will be checked with the set +# naming style. +#argument-rgx= + +# Naming style matching correct attribute names. +attr-naming-style=snake_case + +# Regular expression matching correct attribute names. Overrides attr-naming- +# style. If left empty, attribute names will be checked with the set naming +# style. +#attr-rgx= + +# Bad variable names which should always be refused, separated by a comma. +bad-names=foo, + bar, + baz, + toto, + tutu, + tata + +# Bad variable names regexes, separated by a comma. If names match any regex, +# they will always be refused +bad-names-rgxs= + +# Naming style matching correct class attribute names. +class-attribute-naming-style=any + +# Regular expression matching correct class attribute names. Overrides class- +# attribute-naming-style. If left empty, class attribute names will be checked +# with the set naming style. +#class-attribute-rgx= + +# Naming style matching correct class constant names. +class-const-naming-style=UPPER_CASE + +# Regular expression matching correct class constant names. Overrides class- +# const-naming-style. If left empty, class constant names will be checked with +# the set naming style. +#class-const-rgx= + +# Naming style matching correct class names. +class-naming-style=PascalCase + +# Regular expression matching correct class names. Overrides class-naming- +# style. If left empty, class names will be checked with the set naming style. +#class-rgx= + +# Naming style matching correct constant names. +const-naming-style=UPPER_CASE + +# Regular expression matching correct constant names. Overrides const-naming- +# style. If left empty, constant names will be checked with the set naming +# style. +#const-rgx= + +# Minimum line length for functions/classes that require docstrings, shorter +# ones are exempt. +docstring-min-length=-1 + +# Naming style matching correct function names. +function-naming-style=snake_case + +# Regular expression matching correct function names. Overrides function- +# naming-style. If left empty, function names will be checked with the set +# naming style. +#function-rgx= + +# Good variable names which should always be accepted, separated by a comma. +good-names=i, + j, + k, + ex, + Run, + _ + +# Good variable names regexes, separated by a comma. If names match any regex, +# they will always be accepted +good-names-rgxs= + +# Include a hint for the correct naming format with invalid-name. +include-naming-hint=no + +# Naming style matching correct inline iteration names. +inlinevar-naming-style=any + +# Regular expression matching correct inline iteration names. Overrides +# inlinevar-naming-style. If left empty, inline iteration names will be checked +# with the set naming style. +#inlinevar-rgx= + +# Naming style matching correct method names. +method-naming-style=snake_case + +# Regular expression matching correct method names. Overrides method-naming- +# style. If left empty, method names will be checked with the set naming style. +#method-rgx= + +# Naming style matching correct module names. +module-naming-style=snake_case + +# Regular expression matching correct module names. Overrides module-naming- +# style. If left empty, module names will be checked with the set naming style. +#module-rgx= + +# Colon-delimited sets of names that determine each other's naming style when +# the name regexes allow several styles. +name-group= + +# Regular expression which should only match function or class names that do +# not require a docstring. +no-docstring-rgx=^_ + +# List of decorators that produce properties, such as abc.abstractproperty. Add +# to this list to register other decorators that produce valid properties. +# These decorators are taken in consideration only for invalid-name. +property-classes=abc.abstractproperty + +# Regular expression matching correct type variable names. If left empty, type +# variable names will be checked with the set naming style. +#typevar-rgx= + +# Naming style matching correct variable names. +variable-naming-style=snake_case + +# Regular expression matching correct variable names. Overrides variable- +# naming-style. If left empty, variable names will be checked with the set +# naming style. +#variable-rgx= + + +[REFACTORING] + +# Maximum number of nested blocks for function / method body +max-nested-blocks=5 + +# Complete name of functions that never returns. When checking for +# inconsistent-return-statements if a never returning function is called then +# it will be considered as an explicit return statement and no message will be +# printed. +never-returning-functions=sys.exit,argparse.parse_error diff --git a/dataobjs.py b/dataobjs.py index fdf0e26..b2e0d5e 100644 --- a/dataobjs.py +++ b/dataobjs.py @@ -300,13 +300,16 @@ class PesterProfile: PchumLog.exception("") initials = "XX" PchumLog.debug("initials = " + str(initials)) - if hasattr(self, "time") and time: - if self.time > time: - return "F" + initials - elif self.time < time: - return "P" + initials + if hasattr(self, "time"): + if time: + if self.time > time: + return "F" + initials + elif self.time < time: + return "P" + initials + else: + return "C" + initials else: - return "C" + initials + return initials else: return initials @@ -458,44 +461,26 @@ class PesterProfile: ) ) else: - # Is timeGrammar defined? Not sure if this works as intented, added try except block to be safe. - try: - initials = timeGrammar.pcf + self.initials() + timeGrammar.number - if opchum.handle == reason: - return ( - "%s banned %s from responding to memo." - % (opchum.colorhtml(), opinit, self.colorhtml(), initials) - ) - else: - return ( - "%s banned %s from responding to memo: [%s]." - % ( - opchum.colorhtml(), - opinit, - self.colorhtml(), - initials, - str(reason), - ) - ) - except: - PchumLog.exception("") - initials = self.initials() - if opchum.handle == reason: - return ( - "%s banned %s from responding to memo." - % (opchum.colorhtml(), opinit, self.colorhtml(), initials) - ) - else: - return ( - "%s banned %s from responding to memo: [%s]." - % ( - opchum.colorhtml(), - opinit, - self.colorhtml(), - initials, - str(reason), - ) + PchumLog.exception("") + initials = self.initials() + if opchum.handle == reason: + return "%s banned %s from responding to memo." % ( + opchum.colorhtml(), + opinit, + self.colorhtml(), + initials, + ) + else: + return ( + "%s banned %s from responding to memo: [%s]." + % ( + opchum.colorhtml(), + opinit, + self.colorhtml(), + initials, + str(reason), ) + ) # As far as I'm aware, there's no IRC reply for this, this seems impossible to check for in practice. def memopermabanmsg(self, opchum, opgrammar, syscolor, timeGrammar): diff --git a/generic.py b/generic.py index b8c3fd9..29d1b11 100644 --- a/generic.py +++ b/generic.py @@ -27,9 +27,6 @@ class CaseInsensitiveDict(dict): def __contains__(self, key): return super().__contains__(key.lower()) - def has_key(self, key): - return key.lower() in super() - def __delitem__(self, key): super().__delitem__(key.lower()) diff --git a/pesterchum.py b/pesterchum.py index 52ebb81..5a164c1 100755 --- a/pesterchum.py +++ b/pesterchum.py @@ -169,7 +169,7 @@ try: # PyQt6, QtMultimedia is prefered. from PyQt6 import QtMultimedia - # print("Audio module is PyQt6 QtMultimedia.") + print("Audio module is PyQt6 QtMultimedia.") except ImportError: if ostools.isWin32() or ostools.isOSX(): # PyQt5 QtMultimedia has native backends for MacOS and Windows @@ -181,11 +181,6 @@ except ImportError: ) except ImportError: try: - try: - # Mute pygame support print - os.environ["PYGAME_HIDE_SUPPORT_PROMPT"] = "hide" - except: - pass import pygame print( @@ -200,11 +195,6 @@ except ImportError: else: # PyQt5 QtMultimedia needs gstreamer on linux, so pygame is prefered. try: - try: - # Mute pygame support print - os.environ["PYGAME_HIDE_SUPPORT_PROMPT"] = "hide" - except: - pass import pygame print( @@ -2292,7 +2282,7 @@ class PesterWindow(MovingWindow): self.moodsLabel.setStyleSheet(theme["main/moodlabel/style"]) if hasattr(self, "moods"): - self.moods.removeButtons() + self.moods.removeButtons() # pylint: disable=access-member-before-definition mood_list = theme["main/moods"] mood_list = [{str(k): v for (k, v) in d.items()} for d in mood_list] self.moods = PesterMoodHandler( @@ -2345,9 +2335,10 @@ class PesterWindow(MovingWindow): # if self.theme.has_key("main/mychumhandle/currentMood"): try: moodicon = self.profile().mood.icon(theme) - if hasattr(self, "currentMoodIcon") and self.currentMoodIcon: - self.currentMoodIcon.hide() - self.currentMoodIcon = None + if hasattr(self, "currentMoodIcon"): + if hasattr(self.currentMoodIcon, "hide"): # pylint: disable=E0203 + self.currentMoodIcon.hide() # pylint: disable=E0203 + self.currentMoodIcon = None self.currentMoodIcon = QtWidgets.QLabel(self) self.currentMoodIcon.setPixmap(moodicon.pixmap(moodicon.realsize())) self.currentMoodIcon.move(*theme["main/mychumhandle/currentMood"]) @@ -2389,12 +2380,12 @@ class PesterWindow(MovingWindow): # Set up the sounds we're using. try: # Pygame - soundclass = pygame.mixer.Sound - except: + soundclass = pygame.mixer.Sound # pylint: disable=used-before-assignment + except (NameError, AttributeError): try: # QtMultimedia soundclass = QtMultimedia.QSoundEffect - except: + except (NameError, AttributeError): # death soundclass = NoneSound PchumLog.warning("No sound module loaded?") @@ -3656,8 +3647,9 @@ class PesterWindow(MovingWindow): self.mycolorUpdated.emit() def aboutPesterchum(self): - if hasattr(self, "aboutwindow") and self.aboutwindow: - return + if hasattr(self, "aboutwindow"): + if self.aboutwindow: # pylint: disable=access-member-before-definition + return self.aboutwindow = AboutPesterchum(self) self.aboutwindow.exec() self.aboutwindow = None diff --git a/pnc/lexercon.py b/pnc/lexercon.py index 3c721c1..d87dbaf 100644 --- a/pnc/lexercon.py +++ b/pnc/lexercon.py @@ -1,4 +1,4 @@ -from .unicolor import Color +from pnc.unicolor import Color import re @@ -49,31 +49,31 @@ class Lexeme: raise NotImplementedError -class Message(Lexeme): - """An object designed to represent a message, possibly containing Lexeme - objects in their native form as well. Intended to be a combination of a - list and a string, combining the former with the latter's methods.""" - - def __init__(self, contents, origin): - lexer = Lexer.lexer_for(origin)() - working = lexer.lex(contents) - # TODO: Rebuild all lexemes so that they all 'come from' the same - # format (e.g. their .origin values are all the same as the Message's). - for i, elt in enumerate(working): - try: - # Try to rebuild for the new format - elt = elt.rebuild(origin) - except AttributeError: - # It doesn't let us rebuild, so it's probably not a Lexeme - continue - else: - # Assign it to the proper place, replacing the old one - working[i] = elt - self.origin = origin - self.contents = working - self.string = "".join(lexer.list_convert(working)) - - # TODO: Finish all the rest of this. +# class Message(Lexeme): +# """An object designed to represent a message, possibly containing Lexeme +# objects in their native form as well. Intended to be a combination of a +# list and a string, combining the former with the latter's methods.""" +# +# def __init__(self, contents, origin): +# lexer = Lexer.lexer_for(origin)() +# working = lexer.lex(contents) +# # TODO: Rebuild all lexemes so that they all 'come from' the same +# # format (e.g. their .origin values are all the same as the Message's). +# for i, elt in enumerate(working): +# try: +# # Try to rebuild for the new format +# elt = elt.rebuild(origin) +# except AttributeError: +# # It doesn't let us rebuild, so it's probably not a Lexeme +# continue +# else: +# # Assign it to the proper place, replacing the old one +# working[i] = elt +# self.origin = origin +# self.contents = working +# self.string = "".join(lexer.list_convert(working)) +# +# # TODO: Finish all the rest of this. class Specifier(Lexeme): @@ -587,10 +587,11 @@ class RelayChat(Lexer): # Add a since we'll need one anyway # Is closecolor accessible here? - try: - closecolor() - except Exception as e: - print(e) + # No. :/ + # try: + # closecolor() + # except Exception as e: + # print(e) ##if isinstance(color, LineColor): if isinstance(cstack.pop(), LineColor): @@ -610,10 +611,10 @@ class RelayChat(Lexer): del cstack[-1] # Add a # Is closecolor accessible here? - try: - closecolor() - except Exception as e: - print(e) + # try: + # closecolor() + # except Exception as e: + # print(e) else: # It's a line color, so stop searching. # Using break here prevents the 'else' diff --git a/pnc/unicolor.py b/pnc/unicolor.py index 188652e..e2e9f9e 100644 --- a/pnc/unicolor.py +++ b/pnc/unicolor.py @@ -4,7 +4,7 @@ __all__ = ["Color"] # in mind that this may be phased out in the future. -from .dep.attrdict import AttrDict +from pnc.dep.attrdict import AttrDict import collections import functools diff --git a/pytwmn.py b/pytwmn.py index 368f2e0..641af53 100755 --- a/pytwmn.py +++ b/pytwmn.py @@ -20,9 +20,12 @@ class TwmnError(Exception): def confExists(): + # FIXME try: from xdg import BaseDirectory - + except ImportError: + return False + try: return os.path.join(BaseDirectory.xdg_config_home, "twmn/twmn.conf") except: return False diff --git a/quirks.py b/quirks.py index fcb3e9f..b4fde57 100644 --- a/quirks.py +++ b/quirks.py @@ -49,7 +49,13 @@ class ScriptQuirks: def load(self): self.last = self.quirks.copy() self.quirks.clear() - extension = self.getExtension() + try: + extension = self.getExtension() + except AttributeError: + PchumLog.exception( + "No self.getExtension(), does ScriptQuirks need to be subclassed?" + ) + return filenames = [] if not os.path.exists(os.path.join(self.home, "quirks")): os.makedirs(os.path.join(self.home, "quirks"), exist_ok=True) @@ -65,7 +71,13 @@ class ScriptQuirks: modules = [] for filename in filenames: - extension_length = len(self.getExtension()) + try: + extension_length = len(self.getExtension()) + except AttributeError: + PchumLog.exception( + "No self.getExtension(), does ScriptQuirks need to be subclassed?" + ) + return name = os.path.basename(filename)[:-extension_length] try: module = self.loadModule(name, filename) diff --git a/setup.py b/setup.py.disabled_for_now similarity index 100% rename from setup.py rename to setup.py.disabled_for_now diff --git a/toast.py b/toast.py index 2ba80bc..5c3356d 100644 --- a/toast.py +++ b/toast.py @@ -1,3 +1,4 @@ +"""FIXME: not sure how this works exactly but it seems kinda broken!!""" import os # import time @@ -25,7 +26,7 @@ pynotify = None class DefaultToast: - def __init__(self, machine, title, msg, icon): + def __init__(self, machine, title, msg, icon, parent=None): self.machine = machine self.title = title self.msg = msg @@ -148,7 +149,7 @@ class ToastMachine: self.machine, self.title, self.msg, self.icon ) else: - t = DefaultToast(self.title, self.msg, self.icon) + t = DefaultToast(self.machine, self.title, self.msg, self.icon) t.show() def __init__( @@ -201,8 +202,8 @@ class ToastMachine: try: pytwmn.init() - except pytwmn.ERROR as e: - PchumLog.error("Problem initilizing pytwmn: " + str(e)) + except Exception: + PchumLog.exception("Problem initilizing pytwmn.") return # self.type = type = "default" self.type = type @@ -230,8 +231,9 @@ class ToastMachine: class PesterToast(QtWidgets.QWidget, DefaultToast): def __init__(self, machine, title, msg, icon, time=3000, parent=None): - kwds = dict(machine=machine, title=title, msg=msg, icon=icon) - super().__init__(parent, **kwds) + # FIXME: Not sure how this works exactly either xd, can't we init the parents seperately? + kwds = dict(parent=parent, machine=machine, title=title, msg=msg, icon=icon) + super().__init__(**kwds) self.machine = machine self.time = time