piecrust2: piecrust/app.py comparison

comparison piecrust/app.py @ 5:474c9882decf

Upgrade to Python 3.

author	Ludovic Chabant <ludovic@chabant.com>
date	Mon, 11 Aug 2014 22:36:47 -0700
parents	f485ba500df3
children	f5ca5c5bed85

comparison

equal deleted inserted replaced

-:7dc71c2dc9a8
+:474c9882decf
 def _load(self):
 if self.paths is None:
 self._values = self._validateAll({})
 return
-path_times = map(lambda p: os.path.getmtime(p), self.paths)
+path_times = [os.path.getmtime(p) for p in self.paths]
 cache_key = hashlib.md5("version=%s&cache=%d" % (
 APP_VERSION, CACHE_VERSION)).hexdigest()
 if self.cache.isValid('config.json', path_times):
 logger.debug("Loading configuration from cache...")
 'enable_debug_info': True
 }
 sitec = values.get('site')
 if sitec is None:
 sitec = {}
-for key, val in default_sitec.iteritems():
+for key, val in default_sitec.items():
 sitec.setdefault(key, val)
 values['site'] = sitec
 # Add a section for our cached information.
 cachec = {}
 # Cache auto-format regexes.
 if not isinstance(sitec['auto_formats'], dict):
 raise ConfigurationError("The 'site/auto_formats' setting must be a dictionary.")
 cachec['auto_formats_re'] = r"\.(%s)$" % (
 '|'.join(
-map(lambda i: re.escape(i), sitec['auto_formats'].keys())))
+[re.escape(i) for i in list(sitec['auto_formats'].keys())]))
 if sitec['default_auto_format'] not in sitec['auto_formats']:
 raise ConfigurationError("Default auto-format '%s' is not declared." % sitec['default_auto_format'])
 # Cache pagination suffix regex.
 pgn_suffix = re.escape(sitec['pagination_suffix'])
 raise ConfigurationError("The 'site/routes' setting must be a list.")
 # Add the theme page source if no sources were defined in the theme
 # configuration itself.
 has_any_theme_source = False
-for sn, sc in sourcesc.iteritems():
+for sn, sc in sourcesc.items():
 if sc.get('realm') == REALM_THEME:
 has_any_theme_source = True
 break
 if not has_any_theme_source:
 sitec['sources']['theme_pages'] = {
 'source': 'theme_pages',
 'func': 'pcurl(path)'})
 # Sources have the `default` scanner by default, duh. Also, a bunch
 # of other default values for other configuration stuff.
-for sn, sc in sourcesc.iteritems():
+for sn, sc in sourcesc.items():
 if not isinstance(sc, dict):
 raise ConfigurationError("All sources in 'site/sources' must be dictionaries.")
 sc.setdefault('type', 'default')
 sc.setdefault('fs_endpoint', sn)
 sc.setdefault('data_endpoint', sn)
 raise ConfigurationError("All routes in 'site/routes' must have an 'url'.")
 if rc_url[0] != '/':
 raise ConfigurationError("Route URLs must start with '/'.")
 if rc.get('source') is None:
 raise ConfigurationError("Routes must specify a source.")
-if rc['source'] not in sourcesc.keys():
+if rc['source'] not in list(sourcesc.keys()):
 raise ConfigurationError("Route is referencing unknown source: %s" %
 rc['source'])
 rc.setdefault('taxonomy', None)
 rc.setdefault('page_suffix', '/%num%')
 # Validate taxonomies.
 sitec.setdefault('taxonomies', {})
 taxonomiesc = sitec.get('taxonomies')
-for tn, tc in taxonomiesc.iteritems():
+for tn, tc in taxonomiesc.items():
 tc.setdefault('multiple', False)
 tc.setdefault('term', tn)
 tc.setdefault('page', '_%s.%%ext%%' % tc['term'])
 # Validate endpoints, and make sure the theme has a default source.
 reserved_endpoints = set(['piecrust', 'site', 'page', 'route',
 'assets', 'pagination', 'siblings',
 'family'])
-for name, src in sitec['sources'].iteritems():
+for name, src in sitec['sources'].items():
 endpoint = src['data_endpoint']
 if endpoint in reserved_endpoints:
 raise ConfigurationError(
 "Source '%s' is using a reserved endpoint name: %s" %
 (name, endpoint))
 if sitec is None:
 return
 tplc = sitec.get('templates_dirs')
 if tplc is None:
 return
-if isinstance(tplc, types.StringTypes):
+if isinstance(tplc, str):
 tplc = [tplc]
-sitec['templates_dirs'] = filter(tplc,
+sitec['templates_dirs'] = list(filter(tplc,
-lambda p: os.path.join(self.theme_dir, p))
+lambda p: os.path.join(self.theme_dir, p)))
 config.fixups.append(_fixupThemeTemplatesDir)
 # We'll also need to flag all page sources as coming from
 # the theme.
 def _fixupThemeSources(index, config):
 if sitec is None:
 sitec = {}
 config['site'] = sitec
 srcc = sitec.get('sources')
 if srcc is not None:
-for sn, sc in srcc.iteritems():
+for sn, sc in srcc.items():
 sc['realm'] = REALM_THEME
 config.fixups.append(_fixupThemeSources)
 return config
 defs = {}
 for cls in self.plugin_loader.getSources():
 defs[cls.SOURCE_NAME] = cls
 sources = []
-for n, s in self.config.get('site/sources').iteritems():
+for n, s in self.config.get('site/sources').items():
 cls = defs.get(s['type'])
 if cls is None:
 raise ConfigurationError("No such page source type: %s" % s['type'])
 src = cls(self, n, s)
 sources.append(src)
 return routes
 @cached_property
 def taxonomies(self):
 taxonomies = []
-for tn, tc in self.config.get('site/taxonomies').iteritems():
+for tn, tc in self.config.get('site/taxonomies').items():
 tax = Taxonomy(self, tn, tc)
 taxonomies.append(tax)
 return taxonomies
 def getSource(self, source_name):
 dirs = []
 # Add custom directories from the configuration.
 conf_dirs = self.config.get(conf_name)
 if conf_dirs is not None:
-if isinstance(conf_dirs, types.StringTypes):
+if isinstance(conf_dirs, str):
 dirs.append(os.path.join(self.root_dir, conf_dirs))
 else:
-dirs += filter(lambda p: os.path.join(self.root_dir, p),
+dirs += [p for p in conf_dirs if os.path.join(self.root_dir, p)]
-conf_dirs)
 # Add the default directory if it exists.
 default_dir = os.path.join(self.root_dir, default_rel_dir)
 if os.path.isdir(default_dir):
 dirs.append(default_dir)

Mercurial > piecrust2

comparison piecrust/app.py @ 5:474c9882decf