[Python-modules-commits] [flufl.enum] 01/04: Import flufl.enum_4.1.orig.tar.gz
Barry Warsaw
barry at moszumanska.debian.org
Fri Oct 9 22:46:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
barry pushed a commit to branch master
in repository flufl.enum.
commit a8a11eb185c97bde375f2a18b89f7fc9f26ce935
Author: Barry Warsaw <barry at python.org>
Date: Fri Oct 9 18:04:56 2015 -0400
Import flufl.enum_4.1.orig.tar.gz
---
PKG-INFO | 63 ++++-
README.rst | 37 ++-
distribute_setup.py | 485 ---------------------------------
flufl.enum.egg-info/PKG-INFO | 63 ++++-
flufl.enum.egg-info/SOURCES.txt | 1 -
flufl/__init__.py | 4 +-
flufl/enum/NEWS.rst | 24 ++
flufl/enum/README.rst | 55 ++--
flufl/enum/__init__.py | 9 +-
flufl/enum/_enum.py | 99 +++++--
flufl/enum/conf.py | 2 +-
flufl/enum/docs/using.rst | 231 ++++++++--------
flufl/enum/tests/fruit.py | 4 +-
flufl/enum/tests/test_documentation.py | 7 +-
flufl/enum/tests/test_enum.py | 112 +++++---
setup.py | 6 +-
setup_helpers.py | 25 +-
template.py | 4 +-
tox.ini | 2 +-
19 files changed, 471 insertions(+), 762 deletions(-)
diff --git a/PKG-INFO b/PKG-INFO
index a42897e..9fcbbc5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: flufl.enum
-Version: 4.0.1
+Version: 4.1
Summary: A Python enumeration package.
Home-page: http://launchpad.net/flufl.enum
Author: Barry Warsaw
@@ -13,34 +13,67 @@ Description: ==========
A Python enumeration package.
- The ``flufl.enum`` library is a Python enumeration package. Its goal is to
+ The `flufl.enum` library is a Python enumeration package. Its goal is to
provide simple, specific, concise semantics in an easy to read and write
- syntax. ``flufl.enum`` has just enough of the features needed to make
+ syntax. `flufl.enum` has just enough of the features needed to make
enumerations useful, but without a lot of extra baggage to weigh them down.
This work grew out of the Mailman 3.0 project.
+ **Note: This package is deprecated!** Python 3.4 added an enum package to its
+ `standard library`_ which is also available as a `third party package`_ on
+ PyPI for older versions of Python. If you are using `flufl.enum` you should
+ switch to the standard enum package.
- License
- =======
- This file is part of flufl.enum.
+ Author
+ ======
+
+ `flufl.enum` is Copyright (C) 2004-2015 Barry Warsaw <barry at python.org>
+
+ Licensed under the terms of the GNU Lesser General Public License, version 3
+ or later. See the COPYING.LESSER file for details.
+
- flufl.enum is free software: you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation, version 3 of the License.
+ Project details
+ ===============
- flufl.enum is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- License for more details.
+ * Project home: https://gitlab.com/warsaw/flufl.enum
+ * Report bugs at: https://gitlab.com/warsaw/flufl.enum/issues
+ * Code hosting: git at gitlab.com:warsaw/flufl.enum.git
+ * Documentation: http://fluflenum.readthedocs.org/
- You should have received a copy of the GNU Lesser General Public License
- along with flufl.enum. If not, see <http://www.gnu.org/licenses/>.
+
+ .. `standard library`: https://docs.python.org/3/library/enum.html
+ .. `third party package`: https://pypi.python.org/pypi/enum34
===================
NEWS for flufl.enum
===================
+ 4.1 (2015-10-09)
+ ================
+ * Fix the regexp that matches identifiers in the functional API.
+ (LP: #1167052)
+ * Deprecate using getitem syntax for accessing enum values by attribute
+ name. Use ``getattr(Enum, name)`` instead. (LP: #1167091)
+ * Duplicate enum values error now provides information on the attribute names
+ that produced the conflict. Given by Eli Bendersky.
+ * The documentation now makes it clear that iteration sort order is not
+ guaranteed for ``Enum`` but *is* guaranteed for ``IntEnum``.
+ * Comparison operators now return ``NotImplemented`` which cause their use to
+ raise ``TypeError`` instead of ``NotImplementedError``. This is for
+ consistency with Python 3. In Python 2, we raise the ``TypeError``
+ explicitly.
+ * ``repr(Enum)`` now sorts in attribute name order, as does iteration over
+ ``Enum``. Iteration over ``IntEnum`` is sorted by the enumeration item
+ values (which must be integers).
+ * ``Enum.__getattr__()`` and special treatment for ``__members__`` is
+ removed. A ``__dir__()`` is provided to limit ``dir(Enum)`` to just the
+ enumeration item names.
+ * As per BDFL request, document the ``__value_factory__`` API.
+ * Add support for Python 3.5 and drop support for Python 2.6.
+
+
4.0.1 (2014-06-11)
==================
* Include MANIFEST.in and tox.ini in the sdist tarball, otherwise the Debian
diff --git a/README.rst b/README.rst
index 0cdb625..06c93b8 100644
--- a/README.rst
+++ b/README.rst
@@ -4,26 +4,35 @@ flufl.enum
A Python enumeration package.
-The ``flufl.enum`` library is a Python enumeration package. Its goal is to
+The `flufl.enum` library is a Python enumeration package. Its goal is to
provide simple, specific, concise semantics in an easy to read and write
-syntax. ``flufl.enum`` has just enough of the features needed to make
+syntax. `flufl.enum` has just enough of the features needed to make
enumerations useful, but without a lot of extra baggage to weigh them down.
This work grew out of the Mailman 3.0 project.
+**Note: This package is deprecated!** Python 3.4 added an enum package to its
+`standard library`_ which is also available as a `third party package`_ on
+PyPI for older versions of Python. If you are using `flufl.enum` you should
+switch to the standard enum package.
-License
-=======
-This file is part of flufl.enum.
+Author
+======
-flufl.enum is free software: you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, version 3 of the License.
+`flufl.enum` is Copyright (C) 2004-2015 Barry Warsaw <barry at python.org>
-flufl.enum is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
+Licensed under the terms of the GNU Lesser General Public License, version 3
+or later. See the COPYING.LESSER file for details.
-You should have received a copy of the GNU Lesser General Public License
-along with flufl.enum. If not, see <http://www.gnu.org/licenses/>.
+
+Project details
+===============
+
+ * Project home: https://gitlab.com/warsaw/flufl.enum
+ * Report bugs at: https://gitlab.com/warsaw/flufl.enum/issues
+ * Code hosting: git at gitlab.com:warsaw/flufl.enum.git
+ * Documentation: http://fluflenum.readthedocs.org/
+
+
+.. `standard library`: https://docs.python.org/3/library/enum.html
+.. `third party package`: https://pypi.python.org/pypi/enum34
diff --git a/distribute_setup.py b/distribute_setup.py
deleted file mode 100644
index bbb6f3c..0000000
--- a/distribute_setup.py
+++ /dev/null
@@ -1,485 +0,0 @@
-#!python
-"""Bootstrap distribute installation
-
-If you want to use setuptools in your package's setup.py, just include this
-file in the same directory with it, and add this to the top of your setup.py::
-
- from distribute_setup import use_setuptools
- use_setuptools()
-
-If you want to require a specific version of setuptools, set a download
-mirror, or use an alternate download directory, you can do so by supplying
-the appropriate options to ``use_setuptools()``.
-
-This file can also be run as a script to install or upgrade setuptools.
-"""
-import os
-import sys
-import time
-import fnmatch
-import tempfile
-import tarfile
-from distutils import log
-
-try:
- from site import USER_SITE
-except ImportError:
- USER_SITE = None
-
-try:
- import subprocess
-
- def _python_cmd(*args):
- args = (sys.executable,) + args
- return subprocess.call(args) == 0
-
-except ImportError:
- # will be used for python 2.3
- def _python_cmd(*args):
- args = (sys.executable,) + args
- # quoting arguments if windows
- if sys.platform == 'win32':
- def quote(arg):
- if ' ' in arg:
- return '"%s"' % arg
- return arg
- args = [quote(arg) for arg in args]
- return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
-
-DEFAULT_VERSION = "0.6.19"
-DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
-SETUPTOOLS_FAKED_VERSION = "0.6c11"
-
-SETUPTOOLS_PKG_INFO = """\
-Metadata-Version: 1.0
-Name: setuptools
-Version: %s
-Summary: xxxx
-Home-page: xxx
-Author: xxx
-Author-email: xxx
-License: xxx
-Description: xxx
-""" % SETUPTOOLS_FAKED_VERSION
-
-
-def _install(tarball):
- # extracting the tarball
- tmpdir = tempfile.mkdtemp()
- log.warn('Extracting in %s', tmpdir)
- old_wd = os.getcwd()
- try:
- os.chdir(tmpdir)
- tar = tarfile.open(tarball)
- _extractall(tar)
- tar.close()
-
- # going in the directory
- subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
- os.chdir(subdir)
- log.warn('Now working in %s', subdir)
-
- # installing
- log.warn('Installing Distribute')
- if not _python_cmd('setup.py', 'install'):
- log.warn('Something went wrong during the installation.')
- log.warn('See the error message above.')
- finally:
- os.chdir(old_wd)
-
-
-def _build_egg(egg, tarball, to_dir):
- # extracting the tarball
- tmpdir = tempfile.mkdtemp()
- log.warn('Extracting in %s', tmpdir)
- old_wd = os.getcwd()
- try:
- os.chdir(tmpdir)
- tar = tarfile.open(tarball)
- _extractall(tar)
- tar.close()
-
- # going in the directory
- subdir = os.path.join(tmpdir, os.listdir(tmpdir)[0])
- os.chdir(subdir)
- log.warn('Now working in %s', subdir)
-
- # building an egg
- log.warn('Building a Distribute egg in %s', to_dir)
- _python_cmd('setup.py', '-q', 'bdist_egg', '--dist-dir', to_dir)
-
- finally:
- os.chdir(old_wd)
- # returning the result
- log.warn(egg)
- if not os.path.exists(egg):
- raise IOError('Could not build the egg.')
-
-
-def _do_download(version, download_base, to_dir, download_delay):
- egg = os.path.join(to_dir, 'distribute-%s-py%d.%d.egg'
- % (version, sys.version_info[0], sys.version_info[1]))
- if not os.path.exists(egg):
- tarball = download_setuptools(version, download_base,
- to_dir, download_delay)
- _build_egg(egg, tarball, to_dir)
- sys.path.insert(0, egg)
- import setuptools
- setuptools.bootstrap_install_from = egg
-
-
-def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
- to_dir=os.curdir, download_delay=15, no_fake=True):
- # making sure we use the absolute path
- to_dir = os.path.abspath(to_dir)
- was_imported = 'pkg_resources' in sys.modules or \
- 'setuptools' in sys.modules
- try:
- try:
- import pkg_resources
- if not hasattr(pkg_resources, '_distribute'):
- if not no_fake:
- _fake_setuptools()
- raise ImportError
- except ImportError:
- return _do_download(version, download_base, to_dir, download_delay)
- try:
- pkg_resources.require("distribute>="+version)
- return
- except pkg_resources.VersionConflict:
- e = sys.exc_info()[1]
- if was_imported:
- sys.stderr.write(
- "The required version of distribute (>=%s) is not available,\n"
- "and can't be installed while this script is running. Please\n"
- "install a more recent version first, using\n"
- "'easy_install -U distribute'."
- "\n\n(Currently using %r)\n" % (version, e.args[0]))
- sys.exit(2)
- else:
- del pkg_resources, sys.modules['pkg_resources'] # reload ok
- return _do_download(version, download_base, to_dir,
- download_delay)
- except pkg_resources.DistributionNotFound:
- return _do_download(version, download_base, to_dir,
- download_delay)
- finally:
- if not no_fake:
- _create_fake_setuptools_pkg_info(to_dir)
-
-def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
- to_dir=os.curdir, delay=15):
- """Download distribute from a specified location and return its filename
-
- `version` should be a valid distribute version number that is available
- as an egg for download under the `download_base` URL (which should end
- with a '/'). `to_dir` is the directory where the egg will be downloaded.
- `delay` is the number of seconds to pause before an actual download
- attempt.
- """
- # making sure we use the absolute path
- to_dir = os.path.abspath(to_dir)
- try:
- from urllib.request import urlopen
- except ImportError:
- from urllib2 import urlopen
- tgz_name = "distribute-%s.tar.gz" % version
- url = download_base + tgz_name
- saveto = os.path.join(to_dir, tgz_name)
- src = dst = None
- if not os.path.exists(saveto): # Avoid repeated downloads
- try:
- log.warn("Downloading %s", url)
- src = urlopen(url)
- # Read/write all in one block, so we don't create a corrupt file
- # if the download is interrupted.
- data = src.read()
- dst = open(saveto, "wb")
- dst.write(data)
- finally:
- if src:
- src.close()
- if dst:
- dst.close()
- return os.path.realpath(saveto)
-
-def _no_sandbox(function):
- def __no_sandbox(*args, **kw):
- try:
- from setuptools.sandbox import DirectorySandbox
- if not hasattr(DirectorySandbox, '_old'):
- def violation(*args):
- pass
- DirectorySandbox._old = DirectorySandbox._violation
- DirectorySandbox._violation = violation
- patched = True
- else:
- patched = False
- except ImportError:
- patched = False
-
- try:
- return function(*args, **kw)
- finally:
- if patched:
- DirectorySandbox._violation = DirectorySandbox._old
- del DirectorySandbox._old
-
- return __no_sandbox
-
-def _patch_file(path, content):
- """Will backup the file then patch it"""
- existing_content = open(path).read()
- if existing_content == content:
- # already patched
- log.warn('Already patched.')
- return False
- log.warn('Patching...')
- _rename_path(path)
- f = open(path, 'w')
- try:
- f.write(content)
- finally:
- f.close()
- return True
-
-_patch_file = _no_sandbox(_patch_file)
-
-def _same_content(path, content):
- return open(path).read() == content
-
-def _rename_path(path):
- new_name = path + '.OLD.%s' % time.time()
- log.warn('Renaming %s into %s', path, new_name)
- os.rename(path, new_name)
- return new_name
-
-def _remove_flat_installation(placeholder):
- if not os.path.isdir(placeholder):
- log.warn('Unkown installation at %s', placeholder)
- return False
- found = False
- for file in os.listdir(placeholder):
- if fnmatch.fnmatch(file, 'setuptools*.egg-info'):
- found = True
- break
- if not found:
- log.warn('Could not locate setuptools*.egg-info')
- return
-
- log.warn('Removing elements out of the way...')
- pkg_info = os.path.join(placeholder, file)
- if os.path.isdir(pkg_info):
- patched = _patch_egg_dir(pkg_info)
- else:
- patched = _patch_file(pkg_info, SETUPTOOLS_PKG_INFO)
-
- if not patched:
- log.warn('%s already patched.', pkg_info)
- return False
- # now let's move the files out of the way
- for element in ('setuptools', 'pkg_resources.py', 'site.py'):
- element = os.path.join(placeholder, element)
- if os.path.exists(element):
- _rename_path(element)
- else:
- log.warn('Could not find the %s element of the '
- 'Setuptools distribution', element)
- return True
-
-_remove_flat_installation = _no_sandbox(_remove_flat_installation)
-
-def _after_install(dist):
- log.warn('After install bootstrap.')
- placeholder = dist.get_command_obj('install').install_purelib
- _create_fake_setuptools_pkg_info(placeholder)
-
-def _create_fake_setuptools_pkg_info(placeholder):
- if not placeholder or not os.path.exists(placeholder):
- log.warn('Could not find the install location')
- return
- pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1])
- setuptools_file = 'setuptools-%s-py%s.egg-info' % \
- (SETUPTOOLS_FAKED_VERSION, pyver)
- pkg_info = os.path.join(placeholder, setuptools_file)
- if os.path.exists(pkg_info):
- log.warn('%s already exists', pkg_info)
- return
-
- log.warn('Creating %s', pkg_info)
- f = open(pkg_info, 'w')
- try:
- f.write(SETUPTOOLS_PKG_INFO)
- finally:
- f.close()
-
- pth_file = os.path.join(placeholder, 'setuptools.pth')
- log.warn('Creating %s', pth_file)
- f = open(pth_file, 'w')
- try:
- f.write(os.path.join(os.curdir, setuptools_file))
- finally:
- f.close()
-
-_create_fake_setuptools_pkg_info = _no_sandbox(_create_fake_setuptools_pkg_info)
-
-def _patch_egg_dir(path):
- # let's check if it's already patched
- pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
- if os.path.exists(pkg_info):
- if _same_content(pkg_info, SETUPTOOLS_PKG_INFO):
- log.warn('%s already patched.', pkg_info)
- return False
- _rename_path(path)
- os.mkdir(path)
- os.mkdir(os.path.join(path, 'EGG-INFO'))
- pkg_info = os.path.join(path, 'EGG-INFO', 'PKG-INFO')
- f = open(pkg_info, 'w')
- try:
- f.write(SETUPTOOLS_PKG_INFO)
- finally:
- f.close()
- return True
-
-_patch_egg_dir = _no_sandbox(_patch_egg_dir)
-
-def _before_install():
- log.warn('Before install bootstrap.')
- _fake_setuptools()
-
-
-def _under_prefix(location):
- if 'install' not in sys.argv:
- return True
- args = sys.argv[sys.argv.index('install')+1:]
- for index, arg in enumerate(args):
- for option in ('--root', '--prefix'):
- if arg.startswith('%s=' % option):
- top_dir = arg.split('root=')[-1]
- return location.startswith(top_dir)
- elif arg == option:
- if len(args) > index:
- top_dir = args[index+1]
- return location.startswith(top_dir)
- if arg == '--user' and USER_SITE is not None:
- return location.startswith(USER_SITE)
- return True
-
-
-def _fake_setuptools():
- log.warn('Scanning installed packages')
- try:
- import pkg_resources
- except ImportError:
- # we're cool
- log.warn('Setuptools or Distribute does not seem to be installed.')
- return
- ws = pkg_resources.working_set
- try:
- setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools',
- replacement=False))
- except TypeError:
- # old distribute API
- setuptools_dist = ws.find(pkg_resources.Requirement.parse('setuptools'))
-
- if setuptools_dist is None:
- log.warn('No setuptools distribution found')
- return
- # detecting if it was already faked
- setuptools_location = setuptools_dist.location
- log.warn('Setuptools installation detected at %s', setuptools_location)
-
- # if --root or --preix was provided, and if
- # setuptools is not located in them, we don't patch it
- if not _under_prefix(setuptools_location):
- log.warn('Not patching, --root or --prefix is installing Distribute'
- ' in another location')
- return
-
- # let's see if its an egg
- if not setuptools_location.endswith('.egg'):
- log.warn('Non-egg installation')
- res = _remove_flat_installation(setuptools_location)
- if not res:
- return
- else:
- log.warn('Egg installation')
- pkg_info = os.path.join(setuptools_location, 'EGG-INFO', 'PKG-INFO')
- if (os.path.exists(pkg_info) and
- _same_content(pkg_info, SETUPTOOLS_PKG_INFO)):
- log.warn('Already patched.')
- return
- log.warn('Patching...')
- # let's create a fake egg replacing setuptools one
- res = _patch_egg_dir(setuptools_location)
- if not res:
- return
- log.warn('Patched done.')
- _relaunch()
-
-
-def _relaunch():
- log.warn('Relaunching...')
- # we have to relaunch the process
- # pip marker to avoid a relaunch bug
- if sys.argv[:3] == ['-c', 'install', '--single-version-externally-managed']:
- sys.argv[0] = 'setup.py'
- args = [sys.executable] + sys.argv
- sys.exit(subprocess.call(args))
-
-
-def _extractall(self, path=".", members=None):
- """Extract all members from the archive to the current working
- directory and set owner, modification time and permissions on
- directories afterwards. `path' specifies a different directory
- to extract to. `members' is optional and must be a subset of the
- list returned by getmembers().
- """
- import copy
- import operator
- from tarfile import ExtractError
- directories = []
-
- if members is None:
- members = self
-
- for tarinfo in members:
- if tarinfo.isdir():
- # Extract directories with a safe mode.
- directories.append(tarinfo)
- tarinfo = copy.copy(tarinfo)
- tarinfo.mode = 448 # decimal for oct 0700
- self.extract(tarinfo, path)
-
- # Reverse sort directories.
- if sys.version_info < (2, 4):
- def sorter(dir1, dir2):
- return cmp(dir1.name, dir2.name)
- directories.sort(sorter)
- directories.reverse()
- else:
- directories.sort(key=operator.attrgetter('name'), reverse=True)
-
- # Set correct owner, mtime and filemode on directories.
- for tarinfo in directories:
- dirpath = os.path.join(path, tarinfo.name)
- try:
- self.chown(tarinfo, dirpath)
- self.utime(tarinfo, dirpath)
- self.chmod(tarinfo, dirpath)
- except ExtractError:
- e = sys.exc_info()[1]
- if self.errorlevel > 1:
- raise
- else:
- self._dbg(1, "tarfile: %s" % e)
-
-
-def main(argv, version=DEFAULT_VERSION):
- """Install or upgrade setuptools and EasyInstall"""
- tarball = download_setuptools()
- _install(tarball)
-
-
-if __name__ == '__main__':
- main(sys.argv[1:])
diff --git a/flufl.enum.egg-info/PKG-INFO b/flufl.enum.egg-info/PKG-INFO
index a42897e..9fcbbc5 100644
--- a/flufl.enum.egg-info/PKG-INFO
+++ b/flufl.enum.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: flufl.enum
-Version: 4.0.1
+Version: 4.1
Summary: A Python enumeration package.
Home-page: http://launchpad.net/flufl.enum
Author: Barry Warsaw
@@ -13,34 +13,67 @@ Description: ==========
A Python enumeration package.
- The ``flufl.enum`` library is a Python enumeration package. Its goal is to
+ The `flufl.enum` library is a Python enumeration package. Its goal is to
provide simple, specific, concise semantics in an easy to read and write
- syntax. ``flufl.enum`` has just enough of the features needed to make
+ syntax. `flufl.enum` has just enough of the features needed to make
enumerations useful, but without a lot of extra baggage to weigh them down.
This work grew out of the Mailman 3.0 project.
+ **Note: This package is deprecated!** Python 3.4 added an enum package to its
+ `standard library`_ which is also available as a `third party package`_ on
+ PyPI for older versions of Python. If you are using `flufl.enum` you should
+ switch to the standard enum package.
- License
- =======
- This file is part of flufl.enum.
+ Author
+ ======
+
+ `flufl.enum` is Copyright (C) 2004-2015 Barry Warsaw <barry at python.org>
+
+ Licensed under the terms of the GNU Lesser General Public License, version 3
+ or later. See the COPYING.LESSER file for details.
+
- flufl.enum is free software: you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation, version 3 of the License.
+ Project details
+ ===============
- flufl.enum is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- License for more details.
+ * Project home: https://gitlab.com/warsaw/flufl.enum
+ * Report bugs at: https://gitlab.com/warsaw/flufl.enum/issues
+ * Code hosting: git at gitlab.com:warsaw/flufl.enum.git
+ * Documentation: http://fluflenum.readthedocs.org/
- You should have received a copy of the GNU Lesser General Public License
- along with flufl.enum. If not, see <http://www.gnu.org/licenses/>.
+
+ .. `standard library`: https://docs.python.org/3/library/enum.html
+ .. `third party package`: https://pypi.python.org/pypi/enum34
===================
NEWS for flufl.enum
===================
+ 4.1 (2015-10-09)
+ ================
+ * Fix the regexp that matches identifiers in the functional API.
+ (LP: #1167052)
+ * Deprecate using getitem syntax for accessing enum values by attribute
+ name. Use ``getattr(Enum, name)`` instead. (LP: #1167091)
+ * Duplicate enum values error now provides information on the attribute names
+ that produced the conflict. Given by Eli Bendersky.
+ * The documentation now makes it clear that iteration sort order is not
+ guaranteed for ``Enum`` but *is* guaranteed for ``IntEnum``.
+ * Comparison operators now return ``NotImplemented`` which cause their use to
+ raise ``TypeError`` instead of ``NotImplementedError``. This is for
+ consistency with Python 3. In Python 2, we raise the ``TypeError``
+ explicitly.
+ * ``repr(Enum)`` now sorts in attribute name order, as does iteration over
+ ``Enum``. Iteration over ``IntEnum`` is sorted by the enumeration item
+ values (which must be integers).
+ * ``Enum.__getattr__()`` and special treatment for ``__members__`` is
+ removed. A ``__dir__()`` is provided to limit ``dir(Enum)`` to just the
+ enumeration item names.
+ * As per BDFL request, document the ``__value_factory__`` API.
+ * Add support for Python 3.5 and drop support for Python 2.6.
+
+
4.0.1 (2014-06-11)
==================
* Include MANIFEST.in and tox.ini in the sdist tarball, otherwise the Debian
diff --git a/flufl.enum.egg-info/SOURCES.txt b/flufl.enum.egg-info/SOURCES.txt
index 7700743..b60e6cf 100644
--- a/flufl.enum.egg-info/SOURCES.txt
+++ b/flufl.enum.egg-info/SOURCES.txt
@@ -1,6 +1,5 @@
MANIFEST.in
README.rst
-distribute_setup.py
setup.cfg
setup.py
setup_helpers.py
diff --git a/flufl/__init__.py b/flufl/__init__.py
index 21f55ec..5b1278d 100644
--- a/flufl/__init__.py
+++ b/flufl/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2014 by Barry A. Warsaw
+# Copyright (C) 2004-2015 Barry Warsaw
#
# This file is part of flufl.enum.
#
@@ -13,6 +13,8 @@
#
# You should have received a copy of the GNU Lesser General Public License
# along with flufl.enum. If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Barry Warsaw <barry at python.org>
# this is a namespace package
try:
diff --git a/flufl/enum/NEWS.rst b/flufl/enum/NEWS.rst
index fe13e18..702076e 100644
--- a/flufl/enum/NEWS.rst
+++ b/flufl/enum/NEWS.rst
@@ -2,6 +2,30 @@
NEWS for flufl.enum
===================
+4.1 (2015-10-09)
+================
+ * Fix the regexp that matches identifiers in the functional API.
+ (LP: #1167052)
+ * Deprecate using getitem syntax for accessing enum values by attribute
+ name. Use ``getattr(Enum, name)`` instead. (LP: #1167091)
+ * Duplicate enum values error now provides information on the attribute names
+ that produced the conflict. Given by Eli Bendersky.
+ * The documentation now makes it clear that iteration sort order is not
+ guaranteed for ``Enum`` but *is* guaranteed for ``IntEnum``.
+ * Comparison operators now return ``NotImplemented`` which cause their use to
+ raise ``TypeError`` instead of ``NotImplementedError``. This is for
+ consistency with Python 3. In Python 2, we raise the ``TypeError``
+ explicitly.
+ * ``repr(Enum)`` now sorts in attribute name order, as does iteration over
+ ``Enum``. Iteration over ``IntEnum`` is sorted by the enumeration item
+ values (which must be integers).
+ * ``Enum.__getattr__()`` and special treatment for ``__members__`` is
+ removed. A ``__dir__()`` is provided to limit ``dir(Enum)`` to just the
+ enumeration item names.
+ * As per BDFL request, document the ``__value_factory__`` API.
+ * Add support for Python 3.5 and drop support for Python 2.6.
+
+
4.0.1 (2014-06-11)
==================
* Include MANIFEST.in and tox.ini in the sdist tarball, otherwise the Debian
diff --git a/flufl/enum/README.rst b/flufl/enum/README.rst
index e02c728..4b51e11 100644
--- a/flufl/enum/README.rst
+++ b/flufl/enum/README.rst
@@ -11,57 +11,41 @@ baggage to weigh them down. This work grew out of the Mailman 3.0 project and
it is the enum package used there. This package was previously called
``munepy``.
-``flufl.enum`` is an implementation of the standard library enumeration
-package described in `PEP 435`_ for `Python 3.4`_. It is available as a
-separate package for use in older Python versions.
+**Note: This package is deprecated!** Python 3.4 added an enum package to its
+`standard library`_ which is also available as a `third party package`_ on
+PyPI for older versions of Python. If you are using `flufl.enum` you should
+switch to the standard enum package.
Requirements
============
-``flufl.enum`` requires Python 2.7 or newer, and is compatible with Python 3.2
-and later.
+``flufl.enum`` requires Python 2.7 or newer, and is compatible with Python 3.
Documentation
=============
-A `simple guide`_ to using the library is available within this package. The
-manual is also available online at:
-
- http://package.python.org/flufl.enum
+A `simple guide`_ to using the library is available within this package.
Project details
===============
-The project home page is:
-
- http://launchpad.net/flufl.enum
-
-You should report bugs at:
-
- http://bugs.launchpad.net/flufl.enum
-
-You can download the latest version of the package either from the Cheeseshop:
-
- http://pypi.python.org/pypi/flufl.enum
-
-or from the Launchpad page above. Of course you can also just install it with
-``pip`` or ``easy_install`` from the command line::
+ * Project home: https://gitlab.com/warsaw/flufl.enum
+ * Report bugs at: https://gitlab.com/warsaw/flufl.enum/issues
+ * Code hosting: git at gitlab.com:warsaw/flufl.enum.git
+ * Documentation: http://fluflenum.readthedocs.org/
- % sudo pip install flufl.enum
- % sudo easy_install flufl.enum
+You can install it with `pip`::
-You may want to use `virtualenv`_ instead of installing the package into the
-system Python.
+ % pip install flufl.enum
-You can grab the latest development copy of the code using Bazaar, from the
-Launchpad home page above. See http://bazaar-vcs.org for details on the
-Bazaar distributed revision control system. If you have Bazaar installed, you
-can grab your own branch of the code like this::
+You can grab the latest development copy of the code using git. The master
+repository is hosted on GitLab. If you have git installed, you can grab
+your own branch of the code like this::
- bzr branch lp:flufl.enum
+ $ git clone git at gitlab.com:warsaw/flufl.enum.git
You may contact the author via barry at python.org.
@@ -69,7 +53,7 @@ You may contact the author via barry at python.org.
Copyright
=========
-Copyright (C) 2004-2014 Barry A. Warsaw
+Copyright (C) 2004-2015 Barry A. Warsaw
This file is part of flufl.enum.
@@ -96,6 +80,5 @@ Table of Contents
NEWS.rst
.. _`simple guide`: docs/using.html
-.. _`virtualenv`: http://www.virtualenv.org/en/latest/index.html
-.. _`PEP 435`: http://www.python.org/dev/peps/pep-0435/
-.. _`Python 3.4`: http://www.python.org/dev/peps/pep-0429/
+.. `standard library`: https://docs.python.org/3/library/enum.html
+.. `third party package`: https://pypi.python.org/pypi/enum34
diff --git a/flufl/enum/__init__.py b/flufl/enum/__init__.py
index 39b2989..6240614 100644
--- a/flufl/enum/__init__.py
+++ b/flufl/enum/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2014 by Barry A. Warsaw
+# Copyright (C) 2004-2015 Barry Warsaw
#
# This file is part of flufl.enum
#
@@ -13,6 +13,8 @@
#
# You should have received a copy of the GNU Lesser General Public License
# along with flufl.enum. If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Barry Warsaw <barry at python.org>
"""Package init."""
@@ -21,12 +23,13 @@ from __future__ import absolute_import, print_function, unicode_literals
__metaclass__ = type
__all__ = [
'Enum',
+ 'EnumValue',
'IntEnum',
'__version__',
'make',
]
-__version__ = '4.0.1'
+__version__ = '4.1'
-from ._enum import Enum, IntEnum, make
+from ._enum import Enum, EnumValue, IntEnum, make
diff --git a/flufl/enum/_enum.py b/flufl/enum/_enum.py
index ffeeccc..d755091 100644
--- a/flufl/enum/_enum.py
+++ b/flufl/enum/_enum.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2014 by Barry A. Warsaw
+# Copyright (C) 2004-2015 Barry Warsaw
#
# This file is part of flufl.enum
#
@@ -13,6 +13,8 @@
#
# You should have received a copy of the GNU Lesser General Public License
# along with flufl.enum. If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Barry Warsaw <barry at python.org>
"""Python enumerations."""
@@ -21,21 +23,23 @@ from __future__ import absolute_import, print_function, unicode_literals
__metaclass__ = type
__all__ = [
'Enum',
+ 'EnumValue',
'IntEnum',
'make',
]
import re
+import sys
import warnings
+from operator import itemgetter
COMMASPACE = ', '
SPACE = ' '
-IDENTIFIER_RE = r'[a-zA-Z_][a-zA-Z0-0_]*'
+IDENTIFIER_RE = r'^[a-zA-Z_][a-zA-Z0-9_]*$'
-
class EnumMetaclass(type):
"""Meta class for Enums."""
... 1030 lines suppressed ...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/flufl.enum.git
More information about the Python-modules-commits
mailing list