Skip to content
Permalink
Browse files

Merge 822ca74 into b5bfb56

  • Loading branch information
leifj committed Jan 20, 2019
2 parents b5bfb56 + 822ca74 commit 10c6e71d2e4ed8c9901bf89ce0354c51b6399b87

This file was deleted.

@@ -42,8 +42,8 @@
master_doc = 'index'

# General information about the project.
project = u'Federation Feeder'
copyright = u'2012, Leif Johansson'
project = 'Federation Feeder'
copyright = '2012, Leif Johansson'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
@@ -185,8 +185,8 @@
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [
('index', 'FederationFeeder.tex', u'Federation Feeder Documentation',
u'Leif Johansson', 'manual'),
('index', 'FederationFeeder.tex', 'Federation Feeder Documentation',
'Leif Johansson', 'manual'),
]

# The name of an image file (relative to this directory) to place at the top of
@@ -215,8 +215,8 @@
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
('index', 'federationfeeder', u'Federation Feeder Documentation',
[u'Leif Johansson'], 1)
('index', 'federationfeeder', 'Federation Feeder Documentation',
['Leif Johansson'], 1)
]

# If true, show URL addresses after external links.
@@ -229,8 +229,8 @@
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
('index', 'FederationFeeder', u'Federation Feeder Documentation',
u'Leif Johansson', 'FederationFeeder', 'One line description of project.',
('index', 'FederationFeeder', 'Federation Feeder Documentation',
'Leif Johansson', 'FederationFeeder', 'One line description of project.',
'Miscellaneous'),
]

@@ -1,8 +1,8 @@
mako
six
redis
urllib3==1.23
idna==2.5
urllib3
idna
ipaddr
publicsuffix
lxml==4.1.1
@@ -25,4 +25,4 @@
title.text = e[1]
link.append(title)

print etree.tostring(xrds, pretty_print=True)
print(etree.tostring(xrds, pretty_print=True))
@@ -4,4 +4,4 @@
import yaml

with open(sys.argv[1]) as fd:
print yaml.safe_load(fd)
print(yaml.safe_load(fd))
@@ -18,12 +18,12 @@
install_requires = [
'mako',
'six',
'urllib3==1.23',
'idna==2.5',
'urllib3',
'idna',
'lxml==4.1.1',
'pyyaml >=3.10',
'pyXMLSecurity >=0.15',
'cherrypy==17.3.0',
'cherrypy',
'iso8601 >=0.1.4',
'simplejson >=2.6.2',
'jinja2',
@@ -45,12 +45,6 @@

python_implementation_str = python_implementation()

if not (python_implementation_str == 'CPython' and version_info.major == 2 and (version_info.minor == 6 or version_info.minor == 7)):
raise RuntimeError('ERROR: running under unsupported {python_implementation_str:s} version '
'{major_version:d}.{minor_version:d}. Please consult the documentation for supported platforms. '
.format(python_implementation_str=python_implementation_str,
major_version=version_info.major,
minor_version=version_info.minor))
setup(name='pyFF',
version=__version__,
description="Federation Feeder",
@@ -980,7 +980,7 @@ def check_xml_namespaces(req, *opts):

def _verify(elt):
if isinstance(elt.tag, six.string_types):
for prefix, uri in elt.nsmap.items():
for prefix, uri in list(elt.nsmap.items()):
if not uri.startswith('urn:'):
u = urlparse(uri)
if u.scheme not in ('http', 'https'):
@@ -63,8 +63,8 @@ def deprecated(logger=log, reason="Complain to the developer about unspecified c
def decorating(func):
def new_func(*args, **kwargs):
msg = "Call to deprecated function %s at %s:%d\nReason: %s" % (func.__name__,
func.func_code.co_filename,
func.func_code.co_firstlineno + 1, reason)
func.__code__.co_filename,
func.__code__.co_firstlineno + 1, reason)
if logger:
logger.warn(msg)
else:
@@ -12,6 +12,7 @@
from collections import deque
import six
from concurrent import futures
import traceback
from .parse import parse_resource
from itertools import chain
from .exceptions import ResourceException
@@ -68,7 +69,7 @@ def __contains__(self, item):
return item in self._resources

def __len__(self):
return len(self.values())
return len(list(self.values()))

def __iter__(self):
return self.walk()
@@ -92,7 +93,8 @@ def reload(self, url=None, fail_on_error=False, store=None):
for nr in res:
new_resources.append(nr)
except Exception as ex:
log.error(str(ex))
log.debug(traceback.format_exc())
log.error(ex)
if fail_on_error:
raise ex
resources = new_resources
@@ -5,6 +5,7 @@
import cherrypy
import locale
import os
import six

# Change this variable to your app name!
# The translation files will be under
@@ -23,7 +24,11 @@

mo_location = LOCALE_DIR

gettext.install(True, localedir=None, unicode=1)
if six.PY2:
gettext.install(True, localedir=None, unicode=1)
else:
gettext.install(True, localedir=None)

gettext.find(APP_NAME, mo_location)
gettext.textdomain(APP_NAME)
gettext.bind_textdomain_codeset(APP_NAME, "UTF-8")

0 comments on commit 10c6e71

Please sign in to comment.
You can’t perform that action at this time.