Changeset 18475

Timestamp:

Apr 9, 2022, 3:51:16 AM (3 years ago)

Author:

Ryan J Ollos

Message:

TracWikiExtras 1.3.2dev: Make compatible with Python 3

Refs #14133.

Location:

wikiextrasplugin/trunk/tracwikiextras

Files:

• __init__.py (modified) (1 diff)
• boxes.py (modified) (6 diffs)
• color.py (modified) (2 diffs)
• icons.py (modified) (4 diffs)
• phrases.py (modified) (1 diff)
• tests/util.py (modified) (1 diff)
• util.py (modified) (8 diffs)

wikiextrasplugin/trunk/tracwikiextras/__init__.py

@@ -1 +1 @@
 import pkg_resources
-from boxes import AboutWikiBoxes, Boxes
-from color import Color
-from entities import Entities
-from icons import AboutWikiIcons, Icons, ShowIcons, Smileys
-from phrases import AboutWikiPhrases, Phrases
-from symbols import Symbols
-from unc_paths import UNCPathLink
+from tracwikiextras.boxes import AboutWikiBoxes, Boxes
+from tracwikiextras.color import Color
+from tracwikiextras.entities import Entities
+from tracwikiextras.icons import AboutWikiIcons, Icons, ShowIcons, Smileys
+from tracwikiextras.phrases import AboutWikiPhrases, Phrases
+from tracwikiextras.symbols import Symbols
+from tracwikiextras.unc_paths import UNCPathLink
 
 pkg_resources.require('Trac >= 1.0')

wikiextrasplugin/trunk/tracwikiextras/boxes.py

@@ -19 +19 @@
 from trac.config import BoolOption, IntOption
 from trac.core import implements, Component, TracError
-from trac.util.compat import cleandoc
+from trac.util.text import cleandoc
 from trac.util.translation import _
 from trac.web.api import IRequestFilter, IRequestHandler
@@ -108 +108 @@
     def __init__(self):
         self.word2type = {}
-        for name, data in self.types.iteritems():
+        for name, data in self.types.items():
             self.word2type[name] = name
             for synonym in data[2]:
@@ -166 +166 @@
         urgency = {} # {'urgency': ('color', ["type -words"])}
         # color
-        for u, color in self.urgency_bg.iteritems():
+        for u, color in self.urgency_bg.items():
             urgency[u] = (color, [])
         # words
-        for type, data in self.types.iteritems():
+        for type, data in self.types.items():
             urg, icon, words = data
             urgency[urg][1].append(type)
@@ -273 +273 @@
                 """) % {
                 'name': name,
-                'direction': 'right' if name is 'rbox' else 'left',
+                'direction': 'right' if name == 'rbox' else 'left',
                 'type_description': self._get_type_description(' ' * 5),
                 }
@@ -337 +337 @@
             return self.word2type[word]
         type_ = ''
-        for w in self.word2type.iterkeys():
+        for w in self.word2type.keys():
             try:
                 if w.startswith(word):
@@ -383 +383 @@
             type = args.get('type')
             if not type:
-                for flag, value in args.iteritems():
+                for flag, value in args.items():
                     if value is True:
                         type = flag

wikiextrasplugin/trunk/tracwikiextras/color.py

@@ -16 +16 @@
 
 from trac.core import implements, Component
-from trac.util.compat import cleandoc
+from trac.util.text import cleandoc
 from trac.wiki import IWikiMacroProvider, format_to_html, format_to_oneliner
 
@@ -113 +113 @@
             style_values['font-size'] = '%s%%' % style_values['font-size']
         style = ';'.join('%s:%s' % (k, v) for (k, v) in
-                         style_values.iteritems() if v)
+                         style_values.items() if v)
 
         span = sanitize_attrib(self.env, tag.span(style=style))

wikiextrasplugin/trunk/tracwikiextras/icons.py

@@ -53 +53 @@
 from trac.config import BoolOption, ConfigSection, IntOption, ListOption
 from trac.core import implements, Component
-from trac.util.compat import cleandoc
+from trac.util.text import cleandoc
 from trac.web.chrome import ITemplateProvider
 from trac.wiki import IWikiMacroProvider, IWikiSyntaxProvider, format_to_html
@@ -143 +143 @@
     def get_htdocs_dirs(self):
         dirs = []
-        for data in FUGUE_ICONS.itervalues():
-            for d in data.itervalues():
+        for data in FUGUE_ICONS.values():
+            for d in data.values():
                 dirs.append(tuple(d))
         return dirs
@@ -503 +503 @@
         # First collect wikitexts for each unique filename
         syelims = {} # key=filename, value=wikitext
-        for wikitext, filename in self.smileys.iteritems():
+        for wikitext, filename in self.smileys.items():
             if filename not in syelims:
                 syelims[filename] = [wikitext]
@@ -510 +510 @@
         # Reverse
         smileys = {}
-        for filename, wikitexts in syelims.iteritems():
+        for filename, wikitexts in syelims.items():
             wikitexts.sort()
             smileys[' '.join(wikitexts)] = filename

wikiextrasplugin/trunk/tracwikiextras/phrases.py

@@ -27 +27 @@
 from trac.config import ListOption, ConfigSection
 from trac.core import implements, Component
-from trac.util.compat import cleandoc
+from trac.util.text import cleandoc
 from trac.web.api import IRequestFilter
 from trac.web.chrome import ITemplateProvider, add_stylesheet

wikiextrasplugin/trunk/tracwikiextras/tests/util.py

@@ -242 +242 @@
         for name in names:
             if name not in result:
-                # print '%s%s' % (' '*8, name)
+                # print('%s%s' % (' '*8, name))
                 pass
             else:
-                # print name
+                # print(name)
                 kept += 1
-        # print '\nKept %d names' % kept
+        # print('\nKept %d names' % kept)
         self.assertEqual(kept, keep)
 

wikiextrasplugin/trunk/tracwikiextras/util.py

@@ -20 +20 @@
 
 from trac.util import arity
-from trac.util.compat import sorted
 from trac.util.html import TracHTMLSanitizer
 if hasattr(TracHTMLSanitizer, 'sanitize_attrs'):
@@ -30 +29 @@
 from trac.wiki.api import WikiSystem
 
+# Python 3 compatibility hack
+try:
+    unicode('')
+except NameError:
+    unicode = str
 
 def prepare_regexp(d):
-    syms = d.keys()
-    syms.sort(lambda a, b: cmp(len(b), len(a)))
+    syms = sorted(d.keys(), key=lambda a: len(a))
     return "|".join([r'%s%s%s'
                      % (r'\b' if re.match(r'\w', s[0]) else '',
@@ -82 +85 @@
     >>> items = [1, 2, 3, 4]
     >>> for item in group(items, 2):
-    ...     print item
+    ...     print(item)
     (1, 3)
     (2, 4)
@@ -91 +94 @@
     >>> items = [1, 2, 3, 4, 5]
     >>> for item in group(items, 2):
-    ...     print item
+    ...     print(item)
     (1, 4)
     (2, 5)
@@ -103 +106 @@
     >>> items = [1, 2, 3, 4, 5, 6, 7, 8, 9]
     >>> for item in group(items, 2, lambda x: x != 4):
-    ...     print item
+    ...     print(item)
     (1, 3)
     (2, None)
@@ -206 +209 @@
         c = 0 # longest count
         chars = [] # candidate chars to remove
-        keys = tree.keys()
-        keys.sort()
+        keys = sorted( (k for k in tree.keys() if k is not None) )
         # search candidate chars to remove
         for key in keys:
@@ -239 +241 @@
         """Return the number of leafs in the tree"""
         n = 0
-        for value in tree.itervalues():
+        for value in tree.values():
             if value:
                 n += value[0]
@@ -248 +250 @@
         if buf is None:
             buf=[]
-        for key, value in tree.iteritems():
+        for key, value in tree.items():
             if key is None:
                 buf.append(letters)