Fixes patch to remove doctest remnants

(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key A8C8FBCF)

2 files changed, 43 insertions, 104 deletions

diff --git a/app-portage/layman/ChangeLog b/app-portage/layman/ChangeLog
index 63f23376ee78..726a91e9cb24 100644
--- a/app-portage/layman/ChangeLog
+++ b/app-portage/layman/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-portage/layman
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.216 2014/10/18 03:37:18 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/layman/ChangeLog,v 1.217 2014/10/18 19:28:57 twitch153 Exp $
+
+  18 Oct 2014; Devan Franchini <twitch153@gentoo.org>
+  files/layman-2.2.0-removes-doctest-remnants.patch:
+  Fixes patch to remove doctest remnants
 
 *layman-2.2.0-r4 (18 Oct 2014)
 
diff --git a/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch b/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch
index a55bd48aafcb..0f0d6ab4a30e 100644
--- a/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch
+++ b/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch
@@ -1,30 +1,10 @@
-From 78b27932cc4916696bb436b7670fa38ac2671751 Mon Sep 17 00:00:00 2001
 From: Devan Franchini <twitch153@gentoo.org>
-Date: Fri, 17 Oct 2014 23:00:42 -0400
+Date: Fri, 18 Oct 2014 15:21:24 -0400
 Subject: [PATCH] Removes doctest remnants
 
----
- layman/api.py                                | 12 ----
- layman/argsparser.py                         | 11 ----
- layman/cli.py                                | 12 ----
- layman/config.py                             | 10 ---
- layman/db.py                                 | 18 ------
- layman/dbbase.py                             | 18 ------
- layman/overlays/archive.py                   | 12 ----
- layman/overlays/modules/squashfs/squashfs.py | 11 ----
- layman/overlays/modules/tar/tar.py           | 11 ----
- layman/overlays/overlay.py                   | 11 ----
- layman/remotedb.py                           | 12 ----
- layman/tests/dtest.py                        | 93 ----------------------------
- layman/utils.py                              | 11 ----
- 13 files changed, 242 deletions(-)
- delete mode 100755 layman/tests/dtest.py
-
-diff --git a/layman/api.py b/layman/api.py
-index 60bcbe0..82436fc 100755
---- a/layman/api.py
-+++ b/layman/api.py
-@@ -714,15 +714,3 @@ def create_fd():
+--- a/layman/api.py	2014-10-18 14:27:13.233842116 -0400
++++ b/layman/api.py	2014-10-18 14:29:51.184849673 -0400
+@@ -714,15 +714,3 @@
      write = os.fdopen(fd_w, 'w')
      read = os.fdopen(fd_r, 'r')
      return (read, write, fd_r, fd_w)
@@ -40,11 +20,9 @@ index 60bcbe0..82436fc 100755
 -    doctest.testmod(sys.modules[__name__])
 -
 -    resetwarnings()
-diff --git a/layman/argsparser.py b/layman/argsparser.py
-index 6aeda44..43497a9 100644
---- a/layman/argsparser.py
-+++ b/layman/argsparser.py
-@@ -404,14 +404,3 @@ class ArgsParser(BareConfig):
+--- a/layman/argsparser.py	2014-10-18 14:27:13.233842116 -0400
++++ b/layman/argsparser.py	2014-10-18 14:30:35.256851781 -0400
+@@ -404,14 +404,3 @@
          self.output.debug('ARGSPARSER: Returning keys', 9)
  
          return keys
@@ -59,11 +37,9 @@ index 6aeda44..43497a9 100644
 -if __name__ == '__main__':
 -    import doctest
 -    doctest.testmod(sys.modules[__name__])
-diff --git a/layman/cli.py b/layman/cli.py
-index 47824b8..81b10cd 100644
---- a/layman/cli.py
-+++ b/layman/cli.py
-@@ -397,15 +397,3 @@ class Main(object):
+--- a/layman/cli.py	2014-10-18 14:27:13.233842116 -0400
++++ b/layman/cli.py	2014-10-18 14:32:11.456856384 -0400
+@@ -397,15 +397,3 @@
          # blank newline  -- no " *"
          self.output.notice('')
          return info != {}
@@ -79,11 +55,9 @@ index 47824b8..81b10cd 100644
 -    doctest.testmod(sys.modules[__name__])
 -
 -    resetwarnings()
-diff --git a/layman/config.py b/layman/config.py
-index 3e13899..8ce0074 100644
---- a/layman/config.py
-+++ b/layman/config.py
-@@ -348,13 +348,3 @@ class OptionConfig(BareConfig):
+--- a/layman/config.py	2014-10-18 14:27:13.233842116 -0400
++++ b/layman/config.py	2014-10-18 14:31:02.528853086 -0400
+@@ -348,13 +348,3 @@
          if new_defaults is not None:
              self._defaults.update(new_defaults)
          return
@@ -97,11 +71,9 @@ index 3e13899..8ce0074 100644
 -if __name__ == '__main__':
 -    import doctest
 -    doctest.testmod(sys.modules[__name__])
-diff --git a/layman/db.py b/layman/db.py
-index b874fe8..4edf465 100644
---- a/layman/db.py
-+++ b/layman/db.py
-@@ -315,21 +315,3 @@ class DB(DbBase):
+--- a/layman/db.py	2014-10-18 14:27:13.234842116 -0400
++++ b/layman/db.py	2014-10-18 14:32:32.160857374 -0400
+@@ -315,21 +315,3 @@
              raise Exception('Syncing overlay "' + overlay_name +
                              '" returned status ' + str(result) + '!' +
                              '\ndb.sync()')
@@ -123,11 +95,9 @@ index b874fe8..4edf465 100644
 -    doctest.testmod(sys.modules[__name__])
 -
 -    resetwarnings()
-diff --git a/layman/dbbase.py b/layman/dbbase.py
-index a106af4..aff48b8 100644
---- a/layman/dbbase.py
-+++ b/layman/dbbase.py
-@@ -252,21 +252,3 @@ class DbBase(object):
+--- a/layman/dbbase.py	2014-10-18 14:27:13.234842116 -0400
++++ b/layman/dbbase.py	2014-10-18 14:31:14.648853666 -0400
+@@ -252,21 +252,3 @@
          """returns a list of the overlay names
          """
          return sorted(self.overlays)
@@ -149,11 +119,9 @@ index a106af4..aff48b8 100644
 -    doctest.testmod(sys.modules[__name__])
 -
 -    resetwarnings()
-diff --git a/layman/overlays/archive.py b/layman/overlays/archive.py
-index b1907ee..5dca6a7 100644
---- a/layman/overlays/archive.py
-+++ b/layman/overlays/archive.py
-@@ -188,15 +188,3 @@ class ArchiveOverlay(OverlaySource):
+--- a/layman/overlays/archive.py	2014-10-18 14:27:13.253842116 -0400
++++ b/layman/overlays/archive.py	2014-10-18 14:31:54.640855579 -0400
+@@ -188,15 +188,3 @@
          '''
  
          return self.is_supported()
@@ -169,30 +137,9 @@ index b1907ee..5dca6a7 100644
 -    doctest.testmod(sys.modules[__name__])
 -
 -    resetwarnings()
-diff --git a/layman/overlays/modules/squashfs/squashfs.py b/layman/overlays/modules/squashfs/squashfs.py
-index 912bd62..d0f3464 100644
---- a/layman/overlays/modules/squashfs/squashfs.py
-+++ b/layman/overlays/modules/squashfs/squashfs.py
-@@ -132,14 +132,3 @@ class SquashfsOverlay(ArchiveOverlay):
-         @rtype bool
-         '''
-         return True
--
--if __name__ == '__main__':
--    import doctest
--
--    # Ignore warnings here. We are just testing
--    from warnings     import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
-diff --git a/layman/overlays/modules/tar/tar.py b/layman/overlays/modules/tar/tar.py
-index 9920dd8..7be11de 100644
---- a/layman/overlays/modules/tar/tar.py
-+++ b/layman/overlays/modules/tar/tar.py
-@@ -94,14 +94,3 @@ class TarOverlay(ArchiveOverlay):
+--- a/layman/overlays/modules/tar/tar.py	2014-10-18 14:27:13.245842116 -0400
++++ b/layman/overlays/modules/tar/tar.py	2014-10-18 15:10:13.303965557 -0400
+@@ -94,14 +94,3 @@
          return require_supported(
              [(self.command(),  'tar', 'app-arch/tar'), ],
              self.output.warn)
@@ -207,11 +154,9 @@ index 9920dd8..7be11de 100644
 -    doctest.testmod(sys.modules[__name__])
 -
 -    resetwarnings()
-diff --git a/layman/overlays/overlay.py b/layman/overlays/overlay.py
-index bc57e2e..55ef8a8 100755
---- a/layman/overlays/overlay.py
-+++ b/layman/overlays/overlay.py
-@@ -546,14 +546,3 @@ class Overlay(object):
+--- a/layman/overlays/overlay.py	2014-10-18 14:27:13.253842116 -0400
++++ b/layman/overlays/overlay.py	2014-10-18 14:31:38.624854813 -0400
+@@ -546,14 +546,3 @@
      def source_types(self):
          for i in self.sources:
              yield i.type
@@ -226,15 +171,12 @@ index bc57e2e..55ef8a8 100755
 -if __name__ == '__main__':
 -    import doctest
 -    doctest.testmod(sys.modules[__name__])
-diff --git a/layman/remotedb.py b/layman/remotedb.py
-index e3b6075..f0f7ea9 100644
---- a/layman/remotedb.py
-+++ b/layman/remotedb.py
-@@ -379,15 +379,3 @@ class RemoteDB(DbBase):
- 
+--- a/layman/remotedb.py	2014-10-18 14:27:13.253842116 -0400
++++ b/layman/remotedb.py	2014-10-18 14:29:31.064848710 -0400
+@@ -384,14 +384,3 @@
          self.signed_urls = [i.strip()
              for i in self.config['gpg_signed_lists'].split('\n') if len(i)]
--
+     '''
 -
 -if __name__ == '__main__':
 -    import doctest
@@ -246,11 +188,8 @@ index e3b6075..f0f7ea9 100644
 -    doctest.testmod(sys.modules[__name__])
 -
 -    resetwarnings()
-diff --git a/layman/tests/dtest.py b/layman/tests/dtest.py
-deleted file mode 100755
-index fe973d9..0000000
---- a/layman/tests/dtest.py
-+++ /dev/null
+--- a/layman/tests/dtest.py	2014-10-18 14:27:13.254842117 -0400
++++ /dev/null	2014-10-18 08:55:00.218326161 -0400
 @@ -1,93 +0,0 @@
 -#!/usr/bin/python
 -# -*- coding: utf-8 -*-
@@ -270,7 +209,7 @@ index fe973d9..0000000
 -#
 -'''Aggregates doctests from all modules that provide such tests.'''
 -
--__version__ = '$Id: layman-2.2.0-removes-doctest-remnants.patch,v 1.1 2014/10/18 03:37:18 twitch153 Exp $'
+-__version__ = '$Id: layman-2.2.0-removes-doctest-remnants.patch,v 1.2 2014/10/18 19:28:57 twitch153 Exp $'
 -
 -#===============================================================================
 -#
@@ -345,11 +284,9 @@ index fe973d9..0000000
 -    unittest.main(defaultTest='test_suite')
 -
 -    resetwarnings()
-diff --git a/layman/utils.py b/layman/utils.py
-index b769302..b522759 100644
---- a/layman/utils.py
-+++ b/layman/utils.py
-@@ -347,14 +347,3 @@ def create_overlay_dict(**kwargs):
+--- a/layman/utils.py	2014-10-18 14:27:13.254842117 -0400
++++ b/layman/utils.py	2014-10-18 14:30:24.088851247 -0400
+@@ -347,14 +347,3 @@
      for key in kwargs:
          result[key] = kwargs[key]
      return result
@@ -364,6 +301,4 @@ index b769302..b522759 100644
 -if __name__ == '__main__':
 -    import doctest
 -    doctest.testmod(sys.modules[__name__])
--- 
-2.0.4