Merge branch 'remove-py2' into pep8

requirements/base.txt

@@ -1,4 +1,3 @@
 httplib2==0.12.3
 urwid==2.0.1
 tweepy==3.7.0
-future==0.17.1

setup.py

@@ -41,10 +41,7 @@
 REQUIREMENTS = [
     "urwid==2.0.1",
     "tweepy==3.7.0",
-    "future==0.17.1",
 ]
-if version_info[:2] == (2, 6):
-    REQUIREMENTS.append("argparse")
 
 TEST_REQUIREMENTS = list(REQUIREMENTS)
 TEST_REQUIREMENTS.extend(["mock", "pytest", "coverage", "tox"])
@@ -76,8 +73,6 @@
           "Natural Language :: English",
           "Operating System :: POSIX :: Linux",
           "Operating System :: MacOS",
-          "Programming Language :: Python :: 2.6",
-          "Programming Language :: Python :: 2.7",
           "Programming Language :: Python :: 3.3",
           "Programming Language :: Python :: 3.4",
           "Programming Language :: Python :: 3.5",

tests/test_config.py

@@ -22,7 +22,7 @@
 )
 
 
-class Args(object):
+class Args:
     """
     Represents the arguments.
     """

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py26, py27, py33, py34, py37, pypy, pep8
+envlist = py33,py34,py37,pypy,pep8
 
 [testenv]
 passenv = HOME

turses/api/base.py

@@ -8,10 +8,6 @@
 function to authorize `turses` to use a Twitter account obtaining the OAuth
 tokens.
 """
-from __future__ import print_function
-from builtins import input
-from builtins import object
-
 from abc import ABCMeta, abstractmethod
 from gettext import gettext as _
 
@@ -20,7 +16,6 @@
 from turses.models import is_DM
 from turses.utils import encode
 from turses.meta import async_thread, wrap_exceptions
-from future.utils import with_metaclass
 
 
 TWITTER_CONSUMER_KEY = 'OEn4hrNGknVz9ozQytoR0A'
@@ -75,7 +70,7 @@ def get_authorization_tokens():
         return None
 
 
-class ApiAdapter(with_metaclass(ABCMeta, object)):
+class ApiAdapter(metaclass=ABCMeta):
     """
     A simplified version of the API to use as an adapter for a real
     implementation.

turses/config.py

@@ -57,12 +57,6 @@
 
     $ turses -g /path/to/file
 """
-from __future__ import print_function
-from future import standard_library
-standard_library.install_aliases()
-from builtins import str
-from builtins import object
-
 from sys import exit
 from configparser import RawConfigParser
 from os import getenv, path, mkdir, remove
@@ -422,7 +416,7 @@ def invert_command_map(bindings):
     return command_map
 
 
-class Configuration(object):
+class Configuration:
     """
     Generate and parse configuration files. When instantiated, it loads the
     defaults.

turses/core.py

@@ -3,8 +3,6 @@
 """
 This module contains the controller and key handling logic of turses.
 """
-from builtins import object
-
 import signal
 import logging
 from gettext import gettext as _
@@ -40,7 +38,7 @@ def merge_dicts(*args):
     return result
 
 
-class InputHandler(object):
+class InputHandler:
     """
     Maps user input to calls to :class:`Controller` functions.
     """

turses/meta.py

@@ -3,15 +3,10 @@
 """
 This module contains abstract classes and decorators.
 """
-from future import standard_library
-standard_library.install_aliases()
-from builtins import object
-
 import logging
 from abc import ABCMeta, abstractmethod, abstractproperty
 from functools import wraps
 from threading import Thread
-from future.utils import with_metaclass
 
 
 # - Decorators ----------------------------------------------------------------
@@ -75,7 +70,7 @@ def wrapper(*args, **kwargs):
 # - Abstract classes ----------------------------------------------------------
 
 # FIXME: Use urwid.MonitoredFocusList
-class ActiveList(with_metaclass(ABCMeta, object)):
+class ActiveList(metaclass=ABCMeta):
     """
     A list that contains an *active* element.
 
@@ -157,7 +152,7 @@ def shift_active_end(self):
         pass
 
 
-class Updatable(with_metaclass(ABCMeta, object)):
+class Updatable(metaclass=ABCMeta):
     """
     An abstract class for making a class *updatable*.
 
@@ -231,7 +226,7 @@ def wrapper(self, *args, **kwargs):
     return wrapper
 
 
-class Observable(object):
+class Observable:
     """
     An implementation of the *observer* pattern.
 
@@ -254,7 +249,7 @@ def notify(self):
             observer.update()
 
 
-class Observer(with_metaclass(ABCMeta, object)):
+class Observer(metaclass=ABCMeta):
     """
     An abstract class that can subscribe to updates from
     :class:`~turses.meta.Observable` instances.

turses/models.py

@@ -7,11 +7,7 @@
 import time
 from bisect import insort
 from calendar import timegm
-
-try:
-    from functools import total_ordering
-except ImportError:
-    from turses.utils import total_ordering
+from functools import total_ordering
 
 from turses.meta import (ActiveList, UnsortedActiveList, Updatable, Observable,
                          notify)
@@ -396,7 +392,7 @@ def update_callback(self, result):
         self.add_statuses(result)
 
 
-class User(object):
+class User:
     """
     A Twitter user.
     """
@@ -425,7 +421,7 @@ def __init__(self,
 
 
 @total_ordering
-class Status(object):
+class Status:
     """
     A Twitter status.
     """
@@ -588,7 +584,7 @@ def url(self):
         return None
 
 
-class List(object):
+class List:
     """
     A Twitter list.
     """

turses/session.py

@@ -54,10 +54,6 @@
     # or, alternatively
     $ turses --session interactions
 """
-from future import standard_library
-standard_library.install_aliases()
-from builtins import object
-
 import re
 import logging
 from configparser import RawConfigParser
@@ -99,7 +95,7 @@ def clean_timeline_list_string(timeline_list_string):
             for name in timeline_names if not invalid_name_re.match(name)]
 
 
-class Session(object):
+class Session:
     """Loads and saves sessions."""
 
     def __init__(self, api):

turses/ui.py

@@ -3,13 +3,6 @@
 """
 This module contains the curses UI widgets.
 """
-from __future__ import division
-from future import standard_library
-standard_library.install_aliases()
-from builtins import str
-from past.utils import old_div
-from builtins import object
-
 import os
 import logging
 import re
@@ -35,7 +28,6 @@
                            configuration)
 from turses.models import is_DM, TWEET_MAXIMUM_CHARACTERS
 from turses.utils import encode, is_hashtag, is_username, is_url
-from future.utils import with_metaclass
 
 
 def surround_with_spaces(s):
@@ -546,7 +538,7 @@ def _insert_line(self, line):
 # - Editors -------------------------------------------------------------------
 
 
-class BaseEditor(with_metaclass(signals.MetaSignals, WidgetWrap)):
+class BaseEditor(WidgetWrap, metaclass=signals.MetaSignals):
     """Base class for editors."""
     signals = ['done']
 
@@ -610,7 +602,7 @@ def emit_done_signal(self, content=None):
         emit_signal(self, 'done', content)
 
 
-class TextEditor(with_metaclass(signals.MetaSignals, BaseEditor)):
+class TextEditor(BaseEditor, metaclass=signals.MetaSignals):
     """Editor for creating arbitrary text."""
     signals = ['done']
 
@@ -626,7 +618,7 @@ def __init__(self,
         self._wrap(self.editor)
 
 
-class TweetEditor(with_metaclass(signals.MetaSignals, BaseEditor)):
+class TweetEditor(BaseEditor, metaclass=signals.MetaSignals):
     """Editor for creating tweets."""
     signals = ['done']
 
@@ -659,7 +651,7 @@ def submit(self):
             self.emit_done_signal(self.editor.get_edit_text())
 
 
-class DmEditor(with_metaclass(signals.MetaSignals, TweetEditor)):
+class DmEditor(TweetEditor, metaclass=signals.MetaSignals):
     """Editor for creating DMs."""
     signals = ['done']
 
@@ -773,7 +765,7 @@ def clear(self):
 # - Base list widgets ---------------------------------------------------------
 
 
-class Scrollable(object):
+class Scrollable:
     """A interface that makes widgets *scrollable*."""
     def scroll_up(self):
         raise NotImplementedError
@@ -876,7 +868,7 @@ def __init__(self):
         self.items = []
         self.create_help_buffer()
 
-        offset = int(old_div(len(self.items), 5))
+        offset = int(len(self.items) // 5)
         ScrollableWidgetWrap.__init__(self,
                                       ScrollableListBox(self.items,
                                                         offset=offset,))
@@ -1184,7 +1176,7 @@ def __init__(self, original_widget, title="",
 # - User ----------------------------------------------------------------------
 
 
-class UserInfo(with_metaclass(signals.MetaSignals, WidgetWrap)):
+class UserInfo(WidgetWrap, metaclass=signals.MetaSignals):
     """
     A widget for displaying a Twitter user info.
     """

turses/utils.py

@@ -51,34 +51,3 @@ def encode(string):
             return string
     else:
         return string
-
-
-# For Python < 2.7
-# Code borrowed from python 2.7.3 stdlib
-def total_ordering(cls):
-    """Class decorator that fills in missing ordering methods"""
-    convert = {
-        '__lt__': [('__gt__', lambda self, other: not (self < other or self == other)),
-                   ('__le__', lambda self, other: self < other or self == other),
-                   ('__ge__', lambda self, other: not self < other)],
-        '__le__': [('__ge__', lambda self, other: not self <= other or self == other),
-                   ('__lt__', lambda self, other: self <= other and not self == other),
-                   ('__gt__', lambda self, other: not self <= other)],
-        '__gt__': [('__lt__', lambda self, other: not (self > other or self == other)),
-                   ('__ge__', lambda self, other: self > other or self == other),
-                   ('__le__', lambda self, other: not self > other)],
-        '__ge__': [('__le__', lambda self, other: (not self >= other) or self == other),
-                   ('__gt__', lambda self, other: self >= other and not self == other),
-                   ('__lt__', lambda self, other: not self >= other)]
-    }
-    roots = set(dir(cls)) & set(convert)
-    if not roots:
-        raise ValueError(
-            'must define at least one ordering operation: < > <= >=')
-    root = max(roots)  # prefer __lt__ to __le__ to __gt__ to __ge__
-    for opname, opfunc in convert[root]:
-        if opname not in roots:
-            opfunc.__name__ = opname
-            opfunc.__doc__ = getattr(int, opname).__doc__
-            setattr(cls, opname, opfunc)
-    return cls