Skip to content

Update configure.py #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update configure.py #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
===================================================

"""

from __future__ import print_function
import sys
from os import path, mkdir
from inspect import getargspec
Expand Down Expand Up @@ -163,7 +163,7 @@ def _impl(v):
self.__struct = self.__struct(
Configuration.from_dict({}, pwd=self._pwd))

for k, v in self.iteritems():
for k, v in self.items():
self[k] = _impl(v)

return self
Expand Down Expand Up @@ -281,7 +281,7 @@ def registration(func):
def _timedelta_contructor(loader, node):
item = loader.construct_scalar(node)

if not isinstance(item, basestring) or not item:
if not isinstance(item, str) or not item:
raise ConfigurationError(
"value '%s' cannot be interpreted as date range" % item)
num, typ = item[:-1], item[-1].lower()
Expand Down Expand Up @@ -310,7 +310,7 @@ def _timedelta_contructor(loader, node):
def _bytesize_constructor(loader, node):
item = loader.construct_scalar(node)

if not isinstance(item, basestring) or not item:
if not isinstance(item, str) or not item:
raise ConfigurationError(
"value '%s' cannot be interpreted as byte size" % item)

Expand Down Expand Up @@ -353,7 +353,7 @@ def _bytesize_constructor(loader, node):
def _re_constructor(loader, node):
item = loader.construct_scalar(node)

if not isinstance(item, basestring) or not item:
if not isinstance(item, str) or not item:
raise ConfigurationError(
"value '%s' cannot be interpreted as regular expression" % item)

Expand Down Expand Up @@ -402,7 +402,7 @@ def __init__(self, factory, config):
def __call__(self, ctx):
config = dict(self.config)
factory = self.factory
if isinstance(factory, basestring):
if isinstance(factory, str):
try:
factory = import_string(factory)
except ImportStringError as e:
Expand Down Expand Up @@ -560,9 +560,12 @@ def import_string(import_name, silent=False):
modname = module + '.' + obj
__import__(modname)
return sys.modules[modname]
except ImportError, e:
except ImportError as e:
if not silent:
raise ImportStringError(import_name, e), None, sys.exc_info()[2]
if sys.version_info.major == 2:
exec("raise ImportStringError(import_name, e), None, sys.exc_info()[2]") # Get around SyntaxError in Py3
else:
raise ImportStringError(import_name, e).with_traceback(sys.exc_info()[2])

class ImportStringError(ImportError):
"""Provides information about a failed :func:`import_string` attempt.
Expand Down Expand Up @@ -621,7 +624,7 @@ def format_config(config, _lvl=0):
return buf

def print_config(config):
print format_config(config)
print (format_config(config))

def obj_by_ref(o, path):
for s in path.split("."):
Expand Down