Skip to content

Commit

Permalink
updates for py3 compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
rupe120 committed Nov 14, 2015
1 parent c3a5654 commit df5930c
Show file tree
Hide file tree
Showing 9 changed files with 57 additions and 10 deletions.
24 changes: 24 additions & 0 deletions django_extra_form_fields.egg-info/PKG-INFO
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Metadata-Version: 1.1
Name: django-extra-form-fields
Version: 0.0.1
Summary: Additional form fields for Django applications
Home-page: http://askbot.org
Author: Evgeny.Fadeev
Author-email: [email protected]
License: BSD
Description: Additional form fields to use in Django applications:

* NextUrlField - add to forms that need to store url of next page
* get_next_url - utility function to extract next url from the request object
* UserNameField - field to enter user name - allows unique username site-wide
* UserEmailField - allows unique email address site-wide if ``EMAIL_UNIQUE`` setting is ``True``

Keywords: django,module
Platform: UNKNOWN
Classifier: Development Status :: 4 - Beta
Classifier: Environment :: Web Environment
Classifier: Intended Audience :: Developers
Classifier: License :: OSI Approved :: BSD License
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python
Classifier: Framework :: Django
15 changes: 15 additions & 0 deletions django_extra_form_fields.egg-info/SOURCES.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
AUTHORS
COPYING
LICENSE
MANIFEST.in
ez_setup.py
setup.py
django_extra_form_fields/__init__.py
django_extra_form_fields/conf.py
django_extra_form_fields/default_settings.py
django_extra_form_fields/fields.py
django_extra_form_fields.egg-info/PKG-INFO
django_extra_form_fields.egg-info/SOURCES.txt
django_extra_form_fields.egg-info/dependency_links.txt
django_extra_form_fields.egg-info/requires.txt
django_extra_form_fields.egg-info/top_level.txt
1 change: 1 addition & 0 deletions django_extra_form_fields.egg-info/dependency_links.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions django_extra_form_fields.egg-info/requires.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
multi_registry
1 change: 1 addition & 0 deletions django_extra_form_fields.egg-info/top_level.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
django_extra_form_fields
1 change: 1 addition & 0 deletions django_extra_form_fields/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
* USERNAME_REGEX_STRING - regex for acceptable user name
* EMAIL_UNIQUE - boolean - require unique email address sitewide
"""
from __future__ import absolute_import
from django.conf import settings as django_settings
from multi_registry import MultiRegistry

Expand Down
1 change: 1 addition & 0 deletions django_extra_form_fields/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* UserNameField
* UserEmailField
"""
from __future__ import absolute_import
import logging
import re
import urllib
Expand Down
21 changes: 11 additions & 10 deletions ez_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
This file can also be run as a script to install or upgrade setuptools.
"""
from __future__ import print_function
import sys
DEFAULT_VERSION = "0.6c11"
DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
Expand Down Expand Up @@ -70,10 +71,10 @@ def _validate_md5(egg_name, data):
if egg_name in md5_data:
digest = md5(data).hexdigest()
if digest != md5_data[egg_name]:
print >>sys.stderr, (
print ((
"md5 validation of %s failed! (Possible download problem?)"
% egg_name
)
), file=sys.stderr)
sys.exit(2)
return data

Expand Down Expand Up @@ -103,14 +104,14 @@ def do_download():
return do_download()
try:
pkg_resources.require("setuptools>="+version); return
except pkg_resources.VersionConflict, e:
except pkg_resources.VersionConflict as e:
if was_imported:
print >>sys.stderr, (
print ((
"The required version of setuptools (>=%s) is not available, and\n"
"can't be installed while this script is running. Please install\n"
" a more recent version first, using 'easy_install -U setuptools'."
"\n\n(Currently using %r)"
) % (version, e.args[0])
) % (version, e.args[0]), file=sys.stderr)
sys.exit(2)
else:
del pkg_resources, sys.modules['pkg_resources'] # reload ok
Expand Down Expand Up @@ -216,10 +217,10 @@ def main(argv, version=DEFAULT_VERSION):
os.unlink(egg)
else:
if setuptools.__version__ == '0.0.1':
print >>sys.stderr, (
print ((
"You have an obsolete version of setuptools installed. Please\n"
"remove it from your system entirely before rerunning this script."
)
), file=sys.stderr)
sys.exit(2)

req = "setuptools>="+version
Expand All @@ -238,8 +239,8 @@ def main(argv, version=DEFAULT_VERSION):
from setuptools.command.easy_install import main
main(argv)
else:
print "Setuptools version",version,"or greater has been installed."
print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
print ("Setuptools version",version,"or greater has been installed.")
print ('(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)')

def update_md5(filenames):
"""Update our built-in md5 registry"""
Expand All @@ -262,7 +263,7 @@ def update_md5(filenames):

match = re.search("\nmd5_data = {\n([^}]+)}", src)
if not match:
print >>sys.stderr, "Internal error!"
print ("Internal error!", file=sys.stderr)
sys.exit(2)

src = src[:match.start(1)] + repl + src[match.end(1):]
Expand Down
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 3',
'Framework :: Django',
],
long_description = """Additional form fields to use in Django applications:
Expand Down

0 comments on commit df5930c

Please sign in to comment.