[gentoo-commits] gentoo-x86 commit in dev-python/python-gflags/files: python-gflags-2.0-tests-respect-tmpdir.patch python-gflags-2.0-scripts-install.patch

[gentoo-commits] gentoo-x86 commit in dev-python/python-gflags/files: python-gflags-2.0-tests-respect-tmpdir.patch python-gflags-2.0-scripts-install.patch

[Michal Gorny (mgorny)]

mgorny      12/12/16 16:14:31

  Added:                python-gflags-2.0-tests-respect-tmpdir.patch
                        python-gflags-2.0-scripts-install.patch
  Log:
  Migrate to distutils-r1, run tests and make Python team a maintainer.
  
  (Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key 42B9401D)

Revision  Changes    Path
1.1                  dev-python/python-gflags/files/python-gflags-2.0-tests-respect-tmpdir.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/python-gflags/files/python-gflags-2.0-tests-respect-tmpdir.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/python-gflags/files/python-gflags-2.0-tests-respect-tmpdir.patch?rev=1.1&content-type=text/plain

Index: python-gflags-2.0-tests-respect-tmpdir.patch
===================================================================
From 4a430830e75bfe2228e9d953b12f74a20ec2cb8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sun, 16 Dec 2012 16:53:24 +0100
Subject: [PATCH] Use tempfile.mkdtemp() to create temporary directory.

This creates an unique directory, and respects TMPDIR.
---
 tests/gflags_unittest.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/gflags_unittest.py b/tests/gflags_unittest.py
index 8e948bf..fcddb7b 100755
--- a/tests/gflags_unittest.py
+++ b/tests/gflags_unittest.py
@@ -38,6 +38,7 @@ import cStringIO
 import sys
 import os
 import shutil
+import tempfile
 
 import gflags
 from flags_modules_for_testing import module_foo
@@ -907,17 +908,16 @@ class LoadFromFlagFileTest(googletest.TestCase):
                       flag_values=self.flag_values)
     self.files_to_delete = []
 
+    # Figure out where to create temporary files
+    self.tmp_path = tempfile.mkdtemp(prefix='gflags_unittest')
+
   def tearDown(self):
     self._RemoveTestFiles()
 
   def _SetupTestFiles(self):
     """ Creates and sets up some dummy flagfile files with bogus flags"""
 
-    # Figure out where to create temporary files
-    tmp_path = '/tmp/flags_unittest'
-    if os.path.exists(tmp_path):
-      shutil.rmtree(tmp_path)
-    os.makedirs(tmp_path)
+    tmp_path = self.tmp_path
 
     try:
       tmp_flag_file_1 = open(tmp_path + '/UnitTestFile1.tst', 'w')
@@ -973,6 +973,7 @@ class LoadFromFlagFileTest(googletest.TestCase):
         os.remove(file_name)
       except OSError, e_msg:
         print '%s\n, Problem deleting test file' % e_msg
+    shutil.rmtree(self.tmp_path)
   #end RemoveTestFiles def
 
   def _ReadFlagsFromFiles(self, argv, force_gnu):
-- 
1.8.0.2




1.1                  dev-python/python-gflags/files/python-gflags-2.0-scripts-install.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/python-gflags/files/python-gflags-2.0-scripts-install.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/python-gflags/files/python-gflags-2.0-scripts-install.patch?rev=1.1&content-type=text/plain

Index: python-gflags-2.0-scripts-install.patch
===================================================================
From d544cdad63faa5a53ba524e39f091f4a18e1eeb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sun, 16 Dec 2012 16:27:13 +0100
Subject: [PATCH] Install Python scripts using 'scripts' key.

This is necessary to ensure that the shebangs are properly replaced when
installing for multiple Python implementations.
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 573db2d..ddad318 100755
--- a/setup.py
+++ b/setup.py
@@ -39,6 +39,6 @@ setup(name='python-gflags',
       author_email='google-gflags@googlegroups.com',
       url='http://code.google.com/p/python-gflags',
       py_modules=["gflags", "gflags_validators"],
-      data_files=[("bin", ["gflags2man.py"])],
+      scripts=["gflags2man.py"],
       include_package_data=True,
       )
-- 
1.8.0.2