Matej Cepl
046202169a
* docs_to_tarball_tests_pass_py2k.patch (gh#pyparsing/pyparsing#47) * pass_unitTests.patch (gh#pyparsing/pyparsing#63) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyparsing?expand=0&rev=54
83 lines
3.4 KiB
Diff
83 lines
3.4 KiB
Diff
From 0499a0d795ce9d55b257dae2f39cc3ced145da79 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
|
|
Date: Wed, 21 Nov 2018 11:05:16 +0100
|
|
Subject: [PATCH 1/3] Convert CRLF->CR in CHANGES, LICENSE, and add docs/ to
|
|
tarball
|
|
|
|
---
|
|
CHANGES | 5014 +++++++++++++++++++++++++--------------------------
|
|
LICENSE | 36 +-
|
|
MANIFEST.in | 1 +
|
|
3 files changed, 2526 insertions(+), 2525 deletions(-)
|
|
|
|
--- a/LICENSE
|
|
+++ b/LICENSE
|
|
@@ -1,18 +1,18 @@
|
|
-Permission is hereby granted, free of charge, to any person obtaining
|
|
-a copy of this software and associated documentation files (the
|
|
-"Software"), to deal in the Software without restriction, including
|
|
-without limitation the rights to use, copy, modify, merge, publish,
|
|
-distribute, sublicense, and/or sell copies of the Software, and to
|
|
-permit persons to whom the Software is furnished to do so, subject to
|
|
-the following conditions:
|
|
-
|
|
-The above copyright notice and this permission notice shall be
|
|
-included in all copies or substantial portions of the Software.
|
|
-
|
|
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
+Permission is hereby granted, free of charge, to any person obtaining
|
|
+a copy of this software and associated documentation files (the
|
|
+"Software"), to deal in the Software without restriction, including
|
|
+without limitation the rights to use, copy, modify, merge, publish,
|
|
+distribute, sublicense, and/or sell copies of the Software, and to
|
|
+permit persons to whom the Software is furnished to do so, subject to
|
|
+the following conditions:
|
|
+
|
|
+The above copyright notice and this permission notice shall be
|
|
+included in all copies or substantial portions of the Software.
|
|
+
|
|
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
--- a/examples/antlr_grammar_tests.py
|
|
+++ b/examples/antlr_grammar_tests.py
|
|
@@ -6,7 +6,7 @@ Created on 4 sept. 2010
|
|
Submitted by Luca DallOlio, September, 2010
|
|
'''
|
|
import unittest
|
|
-import antlr_grammar
|
|
+from . import antlr_grammar
|
|
|
|
class Test(unittest.TestCase):
|
|
|
|
@@ -84,4 +84,4 @@ fragment DIGIT : '0'..'9' ;"""
|
|
|
|
if __name__ == "__main__":
|
|
#import sys;sys.argv = ['', 'Test.testOptionsSpec']
|
|
- unittest.main()
|
|
\ No newline at end of file
|
|
+ unittest.main()
|
|
--- a/examples/test_bibparse.py
|
|
+++ b/examples/test_bibparse.py
|
|
@@ -3,8 +3,8 @@
|
|
from os.path import join as pjoin, dirname
|
|
|
|
from pyparsing import ParseException
|
|
-from btpyparse import Macro
|
|
-import btpyparse as bp
|
|
+from .btpyparse import Macro
|
|
+from . import btpyparse as bp
|
|
|
|
from nose.tools import assert_true, assert_false, assert_equal, assert_raises
|
|
|