Cleanup (get rid py26 stuff) (piskvorky#2214)

* add 3.7 to classifier

* drop ez install (outdated & useless)

* replace custom _bit_length with naitive bit_length

* get rid ez_setup

* logging cleanup

* revert __name__ for scripts

gensim/__init__.py

@@ -8,13 +8,6 @@
 __version__ = '3.6.0'
 
 
-class NullHandler(logging.Handler):
-    """For python versions <= 2.6; same as `logging.NullHandler` in 2.7."""
-
-    def emit(self, record):
-        pass
-
-
 logger = logging.getLogger('gensim')
 if len(logger.handlers) == 0:  # To ensure reload() doesn't add another one
-    logger.addHandler(NullHandler())
+    logger.addHandler(logging.NullHandler())

gensim/downloader.py

@@ -59,7 +59,7 @@
 
 user_dir = os.path.expanduser('~')
 base_dir = os.path.join(user_dir, 'gensim-data')
-logger = logging.getLogger('gensim.api')
+logger = logging.getLogger(__name__)
 
 DATA_LIST_URL = "https://raw.githubusercontent.com/RaRe-Technologies/gensim-data/master/list.json"
 DOWNLOAD_BASE_URL = "https://github.com/RaRe-Technologies/gensim-data/releases/download"

gensim/models/rpmodel.py

@@ -44,7 +44,7 @@
 from gensim import interfaces, matutils, utils
 
 
-logger = logging.getLogger('gensim.models.rpmodel')
+logger = logging.getLogger(__name__)
 
 
 class RpModel(interfaces.TransformationABC):

gensim/models/wrappers/ldavowpalwabbit.py

@@ -534,7 +534,7 @@ def _get_vw_train_command(self, corpus_size, update=False):
             # these params are read from model file if updating
             cmd.extend([
                 '--lda', str(self.num_topics),
-                '-b', str(_bit_length(self.num_terms)),
+                '-b', str(self.num_terms.bit_length()),
                 '--lda_alpha', str(self.alpha),
                 '--lda_rho', str(self.eta)
             ])
@@ -857,24 +857,6 @@ def _run_vw_command(cmd):
     return output
 
 
-# if python2.6 support is ever dropped, can change to using int.bit_length()
-def _bit_length(num):
-    """Get number of bits needed to encode given number.
-
-    Parameters
-    ----------
-    num : int
-        Number to encode.
-
-    Returns
-    -------
-    int
-        Number of bits needed to encode given number.
-
-    """
-    return len(bin(num).lstrip('-0b'))
-
-
 def vwmodel2ldamodel(vw_model, iterations=50):
     """Convert :class:`~gensim.models.wrappers.ldavowpalwabbit.LdaVowpalWabbit` to
     :class:`~gensim.models.ldamodel.LdaModel`.

gensim/summarization/textcleaner.py

@@ -27,7 +27,7 @@
 import re
 import logging
 
-logger = logging.getLogger('summarizer.preprocessing.cleaner')
+logger = logging.getLogger(__name__)
 
 try:
     from pattern.en import tag

gensim/test/test_miislita.py

@@ -22,7 +22,7 @@
 from gensim import utils, corpora, models, similarities
 from gensim.test.utils import datapath, get_tmpfile
 
-logger = logging.getLogger('test_miislita')
+logger = logging.getLogger(__name__)
 
 
 class CorpusMiislita(corpora.TextCorpus):

setup.py

@@ -14,15 +14,12 @@
 import platform
 import sys
 import warnings
-import ez_setup
 from setuptools import setup, find_packages, Extension
 from setuptools.command.build_ext import build_ext
 
 if sys.version_info[:2] < (2, 7) or (sys.version_info[:1] == 3 and sys.version_info[:2] < (3, 5)):
     raise Exception('This version of gensim needs Python 2.7, 3.5 or later.')
 
-ez_setup.use_setuptools()
-
 # the following code is adapted from tornado's setup.py:
 # https://github.com/tornadoweb/tornado/blob/master/setup.py
 # to support installing without the extension on platforms where
@@ -334,6 +331,7 @@ def finalize_options(self):
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
         'Topic :: Scientific/Engineering :: Artificial Intelligence',
         'Topic :: Scientific/Engineering :: Information Analysis',
         'Topic :: Text Processing :: Linguistic',