Attachment 218523 Details for Bug 249689 – Proposed patch (since 517046 revision)

[patch] Proposed patch (since 517046 revision)

wxlauncher.diff (text/plain), 4.17 KB, created by lightside on 2020-10-04 16:16:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2020-10-04 16:16:03 UTC

Size: 4.17 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 517046)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	wxlauncher
> PORTVERSION=	0.10.0
>-PORTREVISION=	5
>+PORTREVISION=	6
> DISTVERSIONPREFIX=	release-
> CATEGORIES=	games
> 
>@@ -20,7 +20,7 @@
> GH_ACCOUNT=	scp-fs2open
> GH_PROJECT=	wxLauncher
> 
>-USES=		cmake openal pkgconfig python:2.7,build sdl
>+USES=		cmake openal pkgconfig python:build sdl
> USE_SDL=	sdl2
> CMAKE_ARGS+=	-DRESOURCES_PATH:STRING="${DATADIR}"
> 
>Index: files/patch-scripts_helpparsers.py
>===================================================================
>--- files/patch-scripts_helpparsers.py	(nonexistent)
>+++ files/patch-scripts_helpparsers.py	(working copy)
>@@ -0,0 +1,22 @@
>+--- scripts/helpparsers.py.orig	2020-09-26 12:23:32 UTC
>++++ scripts/helpparsers.py
>+@@ -6,16 +6,16 @@ import traceback
>+ import sys
>+ import shutil
>+ 
>+-import HTMLParser
>++import html.parser
>+ 
>+ from dataclasses import Tag
>+ from utilfunctions import update_attribute, change_filename
>+ 
>+-class OutputParser(HTMLParser.HTMLParser):
>++class OutputParser(html.parser.HTMLParser):
>+   """The class is designed to be used as a base class.  It will output the same html structure as the input file into a file like object (only needs write)."""
>+       
>+   def __init__(self, file, *args, **kwargs):
>+-    HTMLParser.HTMLParser.__init__(self, *args, **kwargs)
>++    html.parser.HTMLParser.__init__(self, *args, **kwargs)
>+     
>+     if hasattr(file, 'write'):
>+       self.outputfile = file
>Index: files/patch-scripts_onlinehelpmaker.py
>===================================================================
>--- files/patch-scripts_onlinehelpmaker.py	(nonexistent)
>+++ files/patch-scripts_onlinehelpmaker.py	(working copy)
>@@ -0,0 +1,54 @@
>+--- scripts/onlinehelpmaker.py.orig	2015-08-26 04:54:06 UTC
>++++ scripts/onlinehelpmaker.py
>+@@ -9,14 +9,14 @@ import string
>+ from optparse import OptionParser
>+ import logging
>+ NOTICE = 25 # added level for app
>+-import HTMLParser
>++import html.parser
>+ 
>+ try:
>+   import markdown
>+ except ImportError:
>+-  print "ERROR: Unable to import markdown the markup parser."
>+-  print " Make sure that markdown has been installed"
>+-  print "  see the ReadMe.txt for more information"
>++  print("ERROR: Unable to import markdown the markup parser.")
>++  print(" Make sure that markdown has been installed")
>++  print("  see the ReadMe.txt for more information")
>+   raise
>+ 
>+ from helpparsers import Stage2Parser, Stage3Parser, Stage4Parser, Stage5Parser
>+@@ -203,7 +203,7 @@ def generate_paths(options):
>+   for i in range(1, 7):
>+     paths['stage%d'%(i)] = os.path.join(options.temp, 'stage%d'%(i))
>+ 
>+-  for path in paths.values():
>++  for path in list(paths.values()):
>+     if not os.path.exists(path):
>+       logging.debug(" Making %s", path)
>+       os.makedirs(path)
>+@@ -304,9 +304,9 @@ def process_input_stage3(file, options, files, extrafi
>+   outfile = open(outname, mode="w")
>+ 
>+   #figure out what subdirectory of the onlinehelp I am in
>+-  subdir = string.replace(os.path.dirname(outname), os.path.normpath(files['stage3']), "")
>++  subdir = os.path.dirname(outname).replace(os.path.normpath(files['stage3']), "")
>+   if subdir.startswith(os.path.sep):
>+-    subdir = string.replace(subdir, os.path.sep, "", 1) # I only want to remove the leading sep
>++    subdir = subdir.replace(os.path.sep, "", 1) # I only want to remove the leading sep
>+     
>+   parser = Stage3Parser(options, files, file=outfile, extrafiles=extrafiles, subdir=subdir)
>+   parser.feed(input)
>+@@ -325,9 +325,9 @@ def process_input_stage4(file, options, files):
>+   outfile = open(outname, mode="w")
>+   
>+   #figure out what subdirectory of the onlinehelp I am in
>+-  subdir = string.replace(os.path.dirname(outname), os.path.normpath(files['stage4']), "")
>++  subdir = os.path.dirname(outname).replace(os.path.normpath(files['stage4']), "")
>+   if subdir.startswith(os.path.sep):
>+-    subdir = string.replace(subdir, os.path.sep, "", 1) # I only want to remove the leading sep
>++    subdir = subdir.replace(os.path.sep, "", 1) # I only want to remove the leading sep
>+ 
>+   parser = Stage4Parser(files=files, file=outfile, options=options,
>+                         subdir=subdir)

Flags:

lightside: maintainer-approval+

Actions: View | Diff

Attachments on bug 249689: 218326 | 218523