commit:     b9bac810ffd3387d240666feb2dc4851fb5ec230
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail 
<DOT> com>
AuthorDate: Mon Sep 12 18:05:52 2016 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Wed Sep 21 03:42:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9bac810

dev-python/hglib: remove unused patches

 dev-python/hglib/files/hglib-0.3-tests.patch      | 63 -----------------
 dev-python/hglib/files/hglib-0.9-pypy-tests.patch | 86 -----------------------
 2 files changed, 149 deletions(-)

diff --git a/dev-python/hglib/files/hglib-0.3-tests.patch 
b/dev-python/hglib/files/hglib-0.3-tests.patch
deleted file mode 100644
index c75c510..00000000
--- a/dev-python/hglib/files/hglib-0.3-tests.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-tests require a more generic method to open, close files to work with pypy
-https://bugs.pypy.org/issue1380
-diff -ur python-hglib-0.3.orig/tests/test-import.py 
python-hglib-0.3/tests/test-import.py
---- tests/test-import.py       2012-07-01 17:11:01.000000000 +0800
-+++ tests/test-import.py       2013-01-23 23:44:12.389473396 +0800
-@@ -22,7 +22,8 @@
-         self.assertEquals(self.client.cat(['a']), '1\n')
- 
-     def test_basic_file(self):
--        open('patch', 'wb').write(patch)
-+        with open('patch', 'wb') as f:
-+            f.write(patch)
- 
-         # --no-commit
-         self.client.import_(['patch'], nocommit=True)
-diff -ur python-hglib-0.3.orig/tests/test-config.py 
python-hglib-0.3/tests/test-config.py
---- tests/test-config.py       2012-07-01 17:11:01.000000000 +0800
-+++ tests/test-config.py       2013-01-23 23:55:06.120502085 +0800
-@@ -3,7 +3,8 @@
- class test_config(common.basetest):
-     def setUp(self):
-         common.basetest.setUp(self)
--        open('.hg/hgrc', 'a').write('[section]\nkey=value\n')
-+      with open('.hg/hgrc', 'a') as f:
-+            f.write('[section]\nkey=value\n')
-         self.client = hglib.open()
- 
-     def test_basic(self):
-diff -ur python-hglib-0.3.orig/tests/test-paths.py 
python-hglib-0.3/tests/test-paths.py
---- tests/test-paths.py        2012-07-01 17:11:01.000000000 +0800
-+++ tests/test-paths.py        2013-01-24 00:04:36.266527106 +0800
-@@ -3,8 +3,8 @@
- 
- class test_paths(common.basetest):
-     def test_basic(self):
--        open('.hg/hgrc', 'a').write('[paths]\nfoo = bar\n')
--
-+        with open('.hg/hgrc', 'a') as f:
-+            f.write('[paths]\nfoo = bar\n')
-         # hgrc isn't watched for changes yet, have to reopen
-         self.client = hglib.open()
-         paths = self.client.paths()
-diff -ur python-hglib-0.3.orig/tests/test-update.py 
python-hglib-0.3/tests/test-update.py
---- tests/test-update.py       2012-11-09 18:56:31.000000000 +0800
-+++ tests/test-update.py       2013-01-24 00:05:40.866529942 +0800
-@@ -33,7 +33,8 @@
-         self.client.commit('fourth')
-         self.client.update(rev2)
-         old = open('a').read()
--        open('a', 'wb').write('a' + old)
-+        with open('a', 'wb') as f:
-+            f.write('a' + old)
-         u, m, r, ur = self.client.update()
-         self.assertEquals(u, 0)
-         self.assertEquals(m, 1)
-@@ -68,5 +69,6 @@
-         self.assertEquals(old, open('a').read())
- 
-     def test_basic_plain(self):
--        open('.hg/hgrc', 'a').write('[defaults]\nupdate=-v\n')
-+        with open('.hg/hgrc', 'a') as f:
-+            f.write('[defaults]\nupdate=-v\n')
-         self.test_basic()

diff --git a/dev-python/hglib/files/hglib-0.9-pypy-tests.patch 
b/dev-python/hglib/files/hglib-0.9-pypy-tests.patch
deleted file mode 100644
index 1c56f50..00000000
--- a/dev-python/hglib/files/hglib-0.9-pypy-tests.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-# HG changeset patch
-# User Matt Mackall <m...@selenic.com>
-# Date 1372027936 18000
-# Node ID e738d6fe5f3ff613a4ee2c0d759eee0ee4f5c9ff
-# Parent  59cb26bf866e793b184842ad23f82fc3551d1742
-tests: make the tests work under Pypy (issue3965)
-
-..which needs explicit close() due to lack of reference counting.
-
-diff -r 59cb26bf866e -r e738d6fe5f3f tests/test-config.py
---- a/tests/test-config.py     Fri Jun 14 18:36:56 2013 +0300
-+++ b/tests/test-config.py     Sun Jun 23 17:52:16 2013 -0500
-@@ -3,7 +3,9 @@
- class test_config(common.basetest):
-     def setUp(self):
-         common.basetest.setUp(self)
--        open('.hg/hgrc', 'a').write('[section]\nkey=value\n')
-+        f = open('.hg/hgrc', 'a')
-+        f.write('[section]\nkey=value\n')
-+        f.close()
-         self.client = hglib.open()
- 
-     def test_basic(self):
-diff -r 59cb26bf866e -r e738d6fe5f3f tests/test-import.py
---- a/tests/test-import.py     Fri Jun 14 18:36:56 2013 +0300
-+++ b/tests/test-import.py     Sun Jun 23 17:52:16 2013 -0500
-@@ -22,7 +22,9 @@
-         self.assertEquals(self.client.cat(['a']), '1\n')
- 
-     def test_basic_file(self):
--        open('patch', 'wb').write(patch)
-+        f = open('patch', 'wb')
-+        f.write(patch)
-+        f.close()
- 
-         # --no-commit
-         self.client.import_(['patch'], nocommit=True)
-diff -r 59cb26bf866e -r e738d6fe5f3f tests/test-paths.py
---- a/tests/test-paths.py      Fri Jun 14 18:36:56 2013 +0300
-+++ b/tests/test-paths.py      Sun Jun 23 17:52:16 2013 -0500
-@@ -3,7 +3,9 @@
- 
- class test_paths(common.basetest):
-     def test_basic(self):
--        open('.hg/hgrc', 'a').write('[paths]\nfoo = bar\n')
-+        f = open('.hg/hgrc', 'a')
-+        f.write('[paths]\nfoo = bar\n')
-+        f.close()
- 
-         # hgrc isn't watched for changes yet, have to reopen
-         self.client = hglib.open()
-diff -r 59cb26bf866e -r e738d6fe5f3f tests/test-update.py
---- a/tests/test-update.py     Fri Jun 14 18:36:56 2013 +0300
-+++ b/tests/test-update.py     Sun Jun 23 17:52:16 2013 -0500
-@@ -33,7 +33,9 @@
-         self.client.commit('fourth')
-         self.client.update(rev2)
-         old = open('a').read()
--        open('a', 'wb').write('a' + old)
-+        f = open('a', 'wb')
-+        f.write('a' + old)
-+        f.close()
-         u, m, r, ur = self.client.update()
-         self.assertEquals(u, 0)
-         self.assertEquals(m, 1)
-@@ -68,12 +70,16 @@
-         self.assertEquals(old, open('a').read())
- 
-     def test_basic_plain(self):
--        open('.hg/hgrc', 'a').write('[defaults]\nupdate=-v\n')
-+        f = open('.hg/hgrc', 'a')
-+        f.write('[defaults]\nupdate=-v\n')
-+        f.close()
-         self.test_basic()
- 
-     def test_largefiles(self):
-         import os
--        open('.hg/hgrc', 'a').write('[extensions]\nlargefiles=\n')
-+        f = open('.hg/hgrc', 'a')
-+        f.write('[extensions]\nlargefiles=\n')
-+        f.close()
-         self.append('b', 'a')
-         try:
-             self.client.rawcommand(['add', 'b', '--large'])
-
-

Reply via email to