Merge pull request #53 from jjhelmus/jh_historic · akruis/python-feedstock@65e6b03 · GitHub

akruis / python-feedstock Public

forked from conda-forge/python-feedstock

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 65e6b03

Browse filesBrowse the repository at this point in the historyBrowse files

jjhelmus

authored

Merge pull request conda-forge#53 from jjhelmus/jh_historic

Python 1.3

2 parents 9c14055 + 0d57606 commit 65e6b03
Copy full SHA for 65e6b03

2 files changed

+11-11Lines changed: 11 additions & 11 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• recipe
  • fileobject_getline.patch
  • meta.yaml

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎recipe/fileobject_getline.patch‎

Copy file name to clipboardExpand all lines: recipe/fileobject_getline.patch

+7-7Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
@@ -1,6 +1,6 @@
1		- --- Objects/fileobject.c.orig 2016-07-01 15:28:08.507866530 -0500
2		- +++ Objects/fileobject.c 2016-07-01 15:28:26.699866320 -0500
3		- @@ -410,7 +410,7 @@
	1	+ --- Objects/fileobject.c.orig 2016-07-02 08:50:48.000000000 -0500
	2	+ +++ Objects/fileobject.c 2016-07-02 08:51:08.000000000 -0500
	3	+ @@ -417,7 +417,7 @@
4	4	*/
5	5
6	6	static object *
@@ -9,7 +9,7 @@
9	9	fileobject *f;
10	10	int n;
11	11	{
12		- @@ -531,7 +531,7 @@
	12	+ @@ -538,7 +538,7 @@
13	13	}
14	14	if (((fileobject*)f)->f_fp == NULL)
15	15	return err_closed();
@@ -18,16 +18,16 @@
18	18	}
19	19
20	20	/* Python method */
21		- @@ -556,7 +556,7 @@
22		- }
	21	+ @@ -563,7 +563,7 @@
	22	+ n = 0;
23	23	}
24	24
25	25	- return getline(f, n);
26	26	+ return _getline(f, n);
27	27	}
28	28
29	29	static object *
30		- @@ -574,7 +574,7 @@
	30	+ @@ -581,7 +581,7 @@
31	31	if ((list = newlistobject(0)) == NULL)
32	32	return NULL;
33	33	for (;;) {

Collapse file

‎recipe/meta.yaml‎

Copy file name to clipboardExpand all lines: recipe/meta.yaml

+4-4Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -1,11 +1,11 @@
1	1	package:
2	2	name: python
3		- version: 1.2
	3	+ version: 1.3
4	4
5	5	source:
6		- fn: python-1.2.tar.gz
7		- url: http://legacy.python.org/download/releases/src/python-1.2.tar.gz
8		- sha256: 86d6e26ef7f478cf35e0c3715bb7f3b33786f5cf4e95b2e6084cd93c1471c37a
	6	+ fn: python-1.3.tar.gz
	7	+ url: http://legacy.python.org/download/releases/src/python-1.3.tar.gz
	8	+ sha256: 892a12d7360b5e6aed0f6a637f5dbdd4ea9a27ee0e2741337393b1d5711d2d33
9	9	patches:
10	10	# Modules/fileobject.c defines a getline function which conflicts with the
11	11	# one in stdio.h, rename the function in the file to _getline

0 commit comments

Comments

0 (0)