Skip to content

flake8ify #376

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

Merged
merged 1 commit into from
Dec 9, 2014
Merged

flake8ify #376

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions markdown/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
text_type = str
int2str = chr
else: # pragma: no cover
string_type = basestring
text_type = unicode
int2str = unichr
string_type = basestring # noqa
text_type = unicode # noqa
int2str = unichr # noqa


"""
Expand Down
20 changes: 12 additions & 8 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ def get_version():


class md_install_scripts(install_scripts):

""" Customized install_scripts. Create markdown_py.bat for win32. """

def run(self):
install_scripts.run(self)

Expand All @@ -59,21 +61,22 @@ def run(self):
f = open(bat_path, 'w')
f.write(bat_str)
f.close()
print ('Created: %s' % bat_path)
print('Created: %s' % bat_path)
except Exception:
_, err, _ = sys.exc_info() # for both 2.x & 3.x compatability
print ('ERROR: Unable to create %s: %s' % (bat_path, err))
print('ERROR: Unable to create %s: %s' % (bat_path, err))


class build_docs(Command):

""" Build markdown documentation into html."""

description = '"build" documentation (convert markdown text to html)'

user_options = [
('build-base=', 'd', 'directory to "build" to'),
('force', 'f', 'forcibly build everything (ignore file timestamps)'),
]
]

boolean_options = ['force']

Expand Down Expand Up @@ -121,7 +124,7 @@ def _get_context(self, src, path):
name, ext = os.path.splitext(file)
parts = [x for x in dir.split(os.sep) if x]
c['source'] = '%s.txt' % name
c['base'] = '../'*len(parts)
c['base'] = '../' * len(parts)
# Build page title
if name.lower() != 'index' or parts:
c['page_title'] = '%s — Python Markdown' % c['title']
Expand All @@ -131,7 +134,7 @@ def _get_context(self, src, path):
crumbs = []
ctemp = '<li><a href="%s">%s</a> &raquo;</li>'
for n, part in enumerate(parts):
href = ('../'*n) + 'index.html'
href = ('../' * n) + 'index.html'
label = part.replace('_', ' ').capitalize()
crumbs.append(ctemp % (href, label))
if c['title'] and name.lower() != 'index':
Expand All @@ -147,7 +150,7 @@ def run(self):
try:
import markdown
except ImportError:
print ('skipping build_docs: Markdown "import" failed!')
print('skipping build_docs: Markdown "import" failed!')
else:
with codecs.open('docs/_template.html', encoding='utf-8') as f:
template = f.read()
Expand All @@ -174,7 +177,7 @@ def run(self):
self.mkpath(os.path.split(outfile)[0])
if self.force or newer(infile, outfile):
if self.verbose:
print ('Converting %s -> %s' % (infile, outfile))
print('Converting %s -> %s' % (infile, outfile))
if not self.dry_run:
with codecs.open(infile, encoding='utf-8') as f:
src = f.read()
Expand All @@ -189,11 +192,12 @@ def run(self):


class md_build(build):

""" Run "build_docs" command from "build" command. """

user_options = build.user_options + [
('no-build-docs', None, 'do not build documentation'),
]
]

boolean_options = build.boolean_options + ['build-docs']

Expand Down