Commit 912d8a50 authored by SVN-Git Migration's avatar SVN-Git Migration

Initialize git-dpm

parents 77aa63c2 1a34ea7f
# see git-dpm(1) from git-dpm package
1a34ea7f229fa51a9080f6d65deff962e001d4e3
1a34ea7f229fa51a9080f6d65deff962e001d4e3
95305858f135c1d42935beaa9003327a3f1d3fd1
95305858f135c1d42935beaa9003327a3f1d3fd1
pyfiglet_0.7.4+dfsg.orig.tar.gz
71164afd6eb5b98d2aea01378d98315c7edf2746
19196
Description: Skip some toilet fonts from the test suite.
From 451d1c7a0ed201667ca4825896b65892b78fa50e Mon Sep 17 00:00:00 2001
From: Stefano Rivera <stefanor@debian.org>
Date: Thu, 8 Oct 2015 10:29:40 -0700
Subject: Skip some toilet fonts from the test suite.
They don't all pass, beacuse pyfiglet doesn't have perfect .tlf handling yet.
Author: Stefano Rivera <stefanor@debian.org>
Forwarded: https://github.com/pwaller/pyfiglet/pull/44
Last-Updated: 2015-07-03
Patch-Name: bad-toilet-fonts.diff
---
pyfiglet/test.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pyfiglet/test.py b/pyfiglet/test.py
index fe28087..d57a915 100755
--- a/pyfiglet/test.py
+++ b/pyfiglet/test.py
@@ -34,6 +34,8 @@
@@ -34,6 +34,8 @@ class Test(object):
self.failed = []
self.oked = []
self.skip = ['runic','pyramid','eftifont'] # known bug..
......
Description: Debian figlet defaults.
Change defaults to be toilet-compatible (font: future)
Author: Stefano Rivera <stefanor@debian.org>
Forwarded: not-needed
Last-Update: 2011-05-29
--- a/pyfiglet/__init__.py
+++ b/pyfiglet/__init__.py
@@ -36,7 +36,7 @@
"""
-DEFAULT_FONT = 'standard'
+DEFAULT_FONT = 'future'
def figlet_format(text, font=DEFAULT_FONT, **kwargs):
Description: Use Debian's figlet fonts.
From 05c849f0185f27397fb40f073ff3a7cc94787e9a Mon Sep 17 00:00:00 2001
From: Stefano Rivera <stefanor@debian.org>
Date: Thu, 8 Oct 2015 10:29:38 -0700
Subject: Use Debian's figlet fonts.
Look in /usr/share/figlet rather than using pkg_resources to find fonts.
Author: Stefano Rivera <stefanor@debian.org>
Forwarded: not-needed
Last-Update: 2014-07-26
Patch-Name: font-location.diff
---
pyfiglet/__init__.py | 10 +++++-----
pyfiglet/test.py | 6 +++---
setup.py | 3 +--
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/pyfiglet/__init__.py b/pyfiglet/__init__.py
index 7329746..a33eaf8 100755
--- a/pyfiglet/__init__.py
+++ b/pyfiglet/__init__.py
@@ -7,7 +7,7 @@
@@ -7,7 +7,7 @@ Python FIGlet adaption
from __future__ import print_function, unicode_literals
......@@ -15,7 +27,7 @@ Last-Update: 2014-07-26
import re
import sys
from optparse import OptionParser
@@ -97,8 +97,8 @@
@@ -97,8 +97,8 @@ class FigletFont(object):
"""
for extension in ('tlf', 'flf'):
fn = '%s.%s' % (font, extension)
......@@ -26,7 +38,7 @@ Last-Update: 2014-07-26
data = data.decode('UTF-8', 'replace')
return data
else:
@@ -108,7 +108,7 @@
@@ -108,7 +108,7 @@ class FigletFont(object):
def isValidFont(cls, font):
if not font.endswith(('.flf', '.tlf')):
return False
......@@ -35,7 +47,7 @@ Last-Update: 2014-07-26
header = f.readline().decode('UTF-8', 'replace')
f.close()
return cls.reMagicNumber.search(header)
@@ -116,7 +116,7 @@
@@ -116,7 +116,7 @@ class FigletFont(object):
@classmethod
def getFonts(cls):
return [font.rsplit('.', 2)[0] for font
......@@ -44,21 +56,11 @@ Last-Update: 2014-07-26
if cls.isValidFont(font)]
@classmethod
--- a/setup.py
+++ b/setup.py
@@ -46,8 +46,7 @@
author='Peter Waller (Thanks to Christopher Jones and Stefano Rivera)',
author_email='peter.waller@gmail.com',
url='https://github.com/pwaller/pyfiglet',
- packages=['pyfiglet', 'pyfiglet.fonts'],
- package_data={'pyfiglet.fonts': ['*.flf']},
+ packages=['pyfiglet'],
entry_points={
'console_scripts': [
'pyfiglet = pyfiglet:main',
diff --git a/pyfiglet/test.py b/pyfiglet/test.py
index 6872201..fe28087 100755
--- a/pyfiglet/test.py
+++ b/pyfiglet/test.py
@@ -38,9 +38,9 @@
@@ -38,9 +38,9 @@ class Test(object):
def outputUsingFigletorToilet(self, text, font, fontpath):
if os.path.isfile(fontpath + '.flf'):
......@@ -70,7 +72,7 @@ Last-Update: 2014-07-26
else:
raise Exception('Missing font file: '+fontpath)
@@ -71,7 +71,7 @@
@@ -71,7 +71,7 @@ class Test(object):
def check_font(self, text, font):
if font in self.skip:
return
......@@ -79,3 +81,17 @@ Last-Update: 2014-07-26
self.f.setFont(font=font)
diff --git a/setup.py b/setup.py
index 43cba4d..10095c6 100755
--- a/setup.py
+++ b/setup.py
@@ -46,8 +46,7 @@ setup(
author='Peter Waller (Thanks to Christopher Jones and Stefano Rivera)',
author_email='peter.waller@gmail.com',
url='https://github.com/pwaller/pyfiglet',
- packages=['pyfiglet', 'pyfiglet.fonts'],
- package_data={'pyfiglet.fonts': ['*.flf']},
+ packages=['pyfiglet'],
entry_points={
'console_scripts': [
'pyfiglet = pyfiglet:main',
Description: Don't install setuptools entry point scripts.
From 966b5c47473bd0b75fdf4a11479911d5b1b9f3b0 Mon Sep 17 00:00:00 2001
From: Stefano Rivera <stefanor@debian.org>
Date: Thu, 8 Oct 2015 10:29:39 -0700
Subject: Don't install setuptools entry point scripts.
We have our own command line wrapper.
Author: Stefano Rivera <stefanor@debian.org>
Forwarded: not-needed
Last-Update: 2014-07-27
Patch-Name: no-entry-points.diff
---
setup.py | 5 -----
1 file changed, 5 deletions(-)
diff --git a/setup.py b/setup.py
index 10095c6..4d16851 100755
--- a/setup.py
+++ b/setup.py
@@ -47,9 +47,4 @@
@@ -47,9 +47,4 @@ setup(
author_email='peter.waller@gmail.com',
url='https://github.com/pwaller/pyfiglet',
packages=['pyfiglet'],
......
Description: In Python 3, args are already decoded
Author: Stefano Rivera <stefanor@debian.org>
From 1a34ea7f229fa51a9080f6d65deff962e001d4e3 Mon Sep 17 00:00:00 2001
From: Stefano Rivera <stefanor@debian.org>
Date: Thu, 8 Oct 2015 10:29:41 -0700
Subject: In Python 3, args are already decoded
Forwarded: https://github.com/pwaller/pyfiglet/pull/45
Last-Updated: 2015-07-03
Patch-Name: py3k.diff
---
pyfiglet/__init__.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pyfiglet/__init__.py b/pyfiglet/__init__.py
index a33eaf8..ff0bea5 100755
--- a/pyfiglet/__init__.py
+++ b/pyfiglet/__init__.py
@@ -791,7 +791,8 @@
@@ -791,7 +791,8 @@ def main():
parser.print_help()
return 1
......
......@@ -7,7 +7,7 @@ Python FIGlet adaption
from __future__ import print_function, unicode_literals
import pkg_resources
import os.path
import re
import sys
from optparse import OptionParser
......@@ -97,8 +97,8 @@ class FigletFont(object):
"""
for extension in ('tlf', 'flf'):
fn = '%s.%s' % (font, extension)
if pkg_resources.resource_exists('pyfiglet.fonts', fn):
data = pkg_resources.resource_string('pyfiglet.fonts', fn)
if os.path.isfile(os.path.join('/usr/share/figlet', fn)):
data = open(os.path.join('/usr/share/figlet', fn), 'rb').read()
data = data.decode('UTF-8', 'replace')
return data
else:
......@@ -108,7 +108,7 @@ class FigletFont(object):
def isValidFont(cls, font):
if not font.endswith(('.flf', '.tlf')):
return False
f = pkg_resources.resource_stream('pyfiglet.fonts', font)
f = open(os.path.join('/usr/share/figlet', font), 'rb')
header = f.readline().decode('UTF-8', 'replace')
f.close()
return cls.reMagicNumber.search(header)
......@@ -116,7 +116,7 @@ class FigletFont(object):
@classmethod
def getFonts(cls):
return [font.rsplit('.', 2)[0] for font
in pkg_resources.resource_listdir('pyfiglet', 'fonts')
in os.listdir('/usr/share/figlet')
if cls.isValidFont(font)]
@classmethod
......@@ -791,7 +791,8 @@ def main():
parser.print_help()
return 1
args = map(lambda arg: arg.decode(sys.stdout.encoding), args)
if sys.version_info < (3,):
args = [arg.decode('UTF-8') for arg in args]
text = ' '.join(args)
......
......@@ -34,13 +34,15 @@ class Test(object):
self.failed = []
self.oked = []
self.skip = ['runic','pyramid','eftifont'] # known bug..
self.skip += ['emboss', 'emboss2', 'future', 'letter', 'pagga',
'smblock', 'smbraille', 'wideterm']
self.f = Figlet()
def outputUsingFigletorToilet(self, text, font, fontpath):
if os.path.isfile(fontpath + '.flf'):
cmd = ('figlet', '-d', 'pyfiglet/fonts', '-f', font, text)
cmd = ('figlet', '-d', '/usr/share/figlet', '-f', font, text)
elif os.path.isfile(fontpath + '.tlf'):
cmd = ('toilet', '-d', 'pyfiglet/fonts', '-f', font, text)
cmd = ('toilet', '-d', '/usr/share/figlet', '-f', font, text)
else:
raise Exception('Missing font file: '+fontpath)
......@@ -71,7 +73,7 @@ class Test(object):
def check_font(self, text, font):
if font in self.skip:
return
fontpath = os.path.join('pyfiglet', 'fonts', font)
fontpath = os.path.join('/usr/share/figlet', font)
self.f.setFont(font=font)
......
......@@ -46,11 +46,5 @@ setup(
author='Peter Waller (Thanks to Christopher Jones and Stefano Rivera)',
author_email='peter.waller@gmail.com',
url='https://github.com/pwaller/pyfiglet',
packages=['pyfiglet', 'pyfiglet.fonts'],
package_data={'pyfiglet.fonts': ['*.flf']},
entry_points={
'console_scripts': [
'pyfiglet = pyfiglet:main',
],
}
packages=['pyfiglet'],
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment