Add python 3 support - closes python-mechanize#9

.travis.yml

@@ -4,6 +4,7 @@ language: python
 python:
     # - 2.6 disabled as the TestLoader.discover() method is not available on python < 2.7
     - 2.7
+    - 3.6
     - pypy
 
 matrix:

mechanize/__init__.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import logging
 

mechanize/_auth.py

@@ -9,7 +9,7 @@
 
 """
 
-from __future__ import absolute_import
+
 from ._urllib2_fork import HTTPPasswordMgr
 from .polyglot import is_string, iteritems
 

mechanize/_clientcookie.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import re
 import time

mechanize/_debug.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import logging
 

mechanize/_entities.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # vim:fileencoding=utf-8
 # License: BSD Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>
 
@@ -16,7 +16,7 @@
     'acute': '´',
     'acy': 'а',
     'aelig': 'æ',
-    'af': '\u2061',
+    'af': '\\u2061',
     'afr': '𝔞',
     'agrave': 'à',
     'alefsym': 'ℵ',
@@ -55,7 +55,7 @@
     'ape': '≊',
     'apid': '≋',
     'apos': "'",
-    'applyfunction': '\u2061',
+    'applyfunction': '\\u2061',
     'approx': '≈',
     'approxeq': '≊',
     'aring': 'å',
@@ -390,11 +390,11 @@
     'emptysmallsquare': '◻',
     'emptyv': '∅',
     'emptyverysmallsquare': '▫',
-    'emsp': '\u2003',
-    'emsp13': '\u2004',
-    'emsp14': '\u2005',
+    'emsp': '\\u2003',
+    'emsp13': '\\u2004',
+    'emsp14': '\\u2005',
     'eng': 'ŋ',
-    'ensp': '\u2002',
+    'ensp': '\\u2002',
     'eogon': 'ę',
     'eopf': '𝕖',
     'epar': '⋕',
@@ -534,7 +534,7 @@
     'gvertneqq': '≩︀',
     'gvne': '≩︀',
     'hacek': 'ˇ',
-    'hairsp': '\u200a',
+    'hairsp': '\\u200a',
     'half': '½',
     'hamilt': 'ℋ',
     'hardcy': 'ъ',
@@ -567,7 +567,7 @@
     'hybull': '⁃',
     'hyphen': '‐',
     'iacute': 'í',
-    'ic': '\u2063',
+    'ic': '\\u2063',
     'icirc': 'î',
     'icy': 'и',
     'idot': 'İ',
@@ -605,8 +605,8 @@
     'intersection': '⋂',
     'intlarhk': '⨗',
     'intprod': '⨼',
-    'invisiblecomma': '\u2063',
-    'invisibletimes': '\u2062',
+    'invisiblecomma': '\\u2063',
+    'invisibletimes': '\\u2062',
     'iocy': 'ё',
     'iogon': 'į',
     'iopf': '𝕚',
@@ -620,7 +620,7 @@
     'isins': '⋴',
     'isinsv': '⋳',
     'isinv': '∈',
-    'it': '\u2062',
+    'it': '\\u2062',
     'itilde': 'ĩ',
     'iukcy': 'і',
     'iuml': 'ï',
@@ -792,7 +792,7 @@
     'lrcorner': '⌟',
     'lrhar': '⇋',
     'lrhard': '⥭',
-    'lrm': '\u200e',
+    'lrm': '\\u200e',
     'lrtri': '⊿',
     'lsaquo': '‹',
     'lscr': '𝓁',
@@ -835,7 +835,7 @@
     'mdash': '—',
     'mddot': '∺',
     'measuredangle': '∡',
-    'mediumspace': '\u205f',
+    'mediumspace': '\\u205f',
     'mellintrf': 'ℳ',
     'mfr': '𝔪',
     'mho': '℧',
@@ -887,10 +887,10 @@
     'nearr': '↗',
     'nearrow': '↗',
     'nedot': '≐̸',
-    'negativemediumspace': '\u200b',
-    'negativethickspace': '\u200b',
-    'negativethinspace': '\u200b',
-    'negativeverythinspace': '\u200b',
+    'negativemediumspace': '\\u200b',
+    'negativethickspace': '\\u200b',
+    'negativethinspace': '\\u200b',
+    'negativeverythinspace': '\\u200b',
     'nequiv': '≢',
     'nesear': '⤨',
     'nesim': '≂̸',
@@ -934,7 +934,7 @@
     'nltrie': '⋬',
     'nltv': '≪̸',
     'nmid': '∤',
-    'nobreak': '\u2060',
+    'nobreak': '\\u2060',
     'nonbreakingspace': '\xa0',
     'nopf': '𝕟',
     'not': '¬',
@@ -1050,7 +1050,7 @@
     'nu': 'ν',
     'num': '#',
     'numero': '№',
-    'numsp': '\u2007',
+    'numsp': '\\u2007',
     'nvap': '≍⃒',
     'nvdash': '⊬',
     'nvge': '≥⃒',
@@ -1201,7 +1201,7 @@
     'prurel': '⊰',
     'pscr': '𝓅',
     'psi': 'ψ',
-    'puncsp': '\u2008',
+    'puncsp': '\\u2008',
     'qfr': '𝔮',
     'qint': '⨌',
     'qopf': '𝕢',
@@ -1307,7 +1307,7 @@
     'risingdotseq': '≓',
     'rlarr': '⇄',
     'rlhar': '⇌',
-    'rlm': '\u200f',
+    'rlm': '\\u200f',
     'rmoust': '⎱',
     'rmoustache': '⎱',
     'rnmid': '⫮',
@@ -1521,9 +1521,9 @@
     'thetav': 'ϑ',
     'thickapprox': '≈',
     'thicksim': '∼',
-    'thickspace': '\u205f\u200a',
-    'thinsp': '\u2009',
-    'thinspace': '\u2009',
+    'thickspace': '\\u205f\\u200a',
+    'thinsp': '\\u2009',
+    'thinspace': '\\u2009',
     'thkap': '≈',
     'thksim': '∼',
     'thorn': 'þ',
@@ -1659,7 +1659,7 @@
     'verticalline': '|',
     'verticalseparator': '❘',
     'verticaltilde': '≀',
-    'verythinspace': '\u200a',
+    'verythinspace': '\\u200a',
     'vfr': '𝔳',
     'vltri': '⊲',
     'vnsub': '⊂⃒',
@@ -1720,15 +1720,15 @@
     'zcy': 'з',
     'zdot': 'ż',
     'zeetrf': 'ℨ',
-    'zerowidthspace': '\u200b',
+    'zerowidthspace': '\\u200b',
     'zeta': 'ζ',
     'zfr': '𝔷',
     'zhcy': 'ж',
     'zigrarr': '⇝',
     'zopf': '𝕫',
     'zscr': '𝓏',
-    'zwj': '\u200d',
-    'zwnj': '\u200c',
+    'zwj': '\\u200d',
+    'zwnj': '\\u200c',
 # }}}
 }
 

mechanize/_equiv.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # vim:fileencoding=utf-8
 # License: BSD Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>
 
@@ -11,7 +11,7 @@
 from ._entities import html5_entities
 from .polyglot import codepoint_to_chr
 
-space_chars = frozenset(("\t", "\n", "\u000C", " ", "\r"))
+space_chars = frozenset(("\t", "\n", "\\u000C", " ", "\r"))
 space_chars_bytes = frozenset(item.encode("ascii") for item in space_chars)
 ascii_letters_bytes = frozenset(
     item.encode("ascii") for item in string.ascii_letters)
@@ -75,7 +75,7 @@ def __next__(self):
             raise TypeError
         return self[p:p + 1]
 
-    def next(self):
+    def __next__(self):
         # Py2 compat
         return self.__next__()
 

mechanize/_form.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import re
 from collections import defaultdict
@@ -13,7 +13,7 @@ class SkipControl(ValueError):
 
 
 def normalize_line_endings(text):
-    return re.sub(ur"(?:(?<!\r)\n)|(?:\r(?!\n))", u"\r\n", text)
+    return re.sub(r"(?:(?<!\r)\n)|(?:\r(?!\n))", "\r\n", text)
 
 
 def label_text(elem):
@@ -66,7 +66,7 @@ def parse_option(elem, parent_of, attrs_map):
 def parse_textarea(elem, parent_of, *a):
     ctype, name, attrs = parse_control(elem, parent_of)
     ctype = 'textarea'
-    attrs['value'] = normalize_line_endings(elem.text or u'')
+    attrs['value'] = normalize_line_endings(elem.text or '')
     return ctype, name, attrs
 
 

mechanize/_form_controls.py

@@ -1,6 +1,6 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # vim:fileencoding=utf-8
-from __future__ import absolute_import
+
 
 import random
 import re
@@ -12,7 +12,7 @@
 from .polyglot import urlparse, urlunparse, urlencode, is_py2, iteritems
 
 if is_py2:
-    from cStringIO import StringIO
+    from io import StringIO
 else:
     from io import StringIO  # 2to3: probably broken when writing bytes
 

mechanize/_gzip.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import struct
 import zlib
@@ -10,7 +10,7 @@
 
 CRC_MASK = 0xffffffff
 if is_py2:
-    CRC_MASK = long(CRC_MASK)
+    CRC_MASK = int(CRC_MASK)
 
 
 def gzip_prefix():
@@ -141,7 +141,7 @@ def __iter__(self):
         if ans:
             yield ans
 
-    def next(self):
+    def __next__(self):
         ans = self.readline()
         if not ans:
             raise StopIteration()
@@ -191,7 +191,7 @@ def http_request(self, request):
             if sum('gzip' in x for x in existing) < 1:
                 existing.append('gzip')
                 request.add_header("Accept-Encoding",
-                                   ', '.join(filter(None, existing)))
+                                   ', '.join([_f for _f in existing if _f]))
         return request
 
     def http_response(self, request, response):

mechanize/_headersutil.py

@@ -9,7 +9,7 @@
 
 """
 
-from __future__ import absolute_import
+
 
 import os
 import re

mechanize/_html.py

@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+
 
 import codecs
 import copy
@@ -35,8 +35,8 @@ def iterlinks(root, base_url):
             if val:
                 url = clean_url(val)
                 yield Link(base_url, url,
-                           compress_whitespace(u''.join(elem_text(tag))), q,
-                           tag.items())
+                           compress_whitespace(''.join(elem_text(tag))), q,
+                           list(tag.items()))
         elif q == 'base':
             href = tag.get('href')
             if href:
@@ -258,7 +258,7 @@ def title(self):
         if self._current_title is lazy:
             self._current_title = get_title(
                 self.root) if self.root is not None else None
-        return self._current_title or u''
+        return self._current_title or ''
 
     @property
     def global_form(self):

mechanize/_http.py

@@ -12,7 +12,7 @@
 
 """
 
-from __future__ import absolute_import
+
 
 import logging
 import socket

mechanize/_mechanize.py

@@ -8,7 +8,7 @@
 included with the distribution).
 
 """
-from __future__ import absolute_import
+
 
 import copy
 import os

mechanize/_opener.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import absolute_import
+
 
 import bisect
 import os

mechanize/_request.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import absolute_import
+
 import logging
 
 from . import _rfc3986