[pitivi] Fix two confusing licenses



commit d282fe5e842455aed7c073992fd85f04f640a4f3
Author: Alexandru Băluț <alexandru balut gmail com>
Date:   Mon Jan 6 00:55:21 2020 +0100

    Fix two confusing licenses
    
    Remove duplicate GPL license from pipeline.py
    
    Remove extra info in test_utils_loggable.py

 pitivi/utils/pipeline.py     |  4 ----
 tests/test_utils_loggable.py | 21 +++++++--------------
 2 files changed, 7 insertions(+), 18 deletions(-)
---
diff --git a/pitivi/utils/pipeline.py b/pitivi/utils/pipeline.py
index a96fb5e1..8d796635 100644
--- a/pitivi/utils/pipeline.py
+++ b/pitivi/utils/pipeline.py
@@ -14,10 +14,6 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
 """High-level pipelines."""
 import contextlib
 import os
diff --git a/tests/test_utils_loggable.py b/tests/test_utils_loggable.py
index cecb7f8a..9296d0bd 100644
--- a/tests/test_utils_loggable.py
+++ b/tests/test_utils_loggable.py
@@ -1,27 +1,21 @@
 # -*- coding: utf-8 -*-
-# -*- Mode: Python; test-case-name: test_log -*-
-# vi:si:et:sw=4:sts=4:ts=4
-#
-# Flumotion - a streaming media server
+# Pitivi video editor
 # Copyright (C) 2004,2005,2006,2007 Fluendo, S.L. (www.fluendo.com).
 # All rights reserved.
+#
 # This file may be distributed and/or modified under the terms of
 # the GNU General Public License version 2 as published by
 # the Free Software Foundation.
+#
 # This file is distributed without any warranty; without even the implied
 # warranty of merchantability or fitness for a particular purpose.
-# See "LICENSE.GPL" in the source distribution for more information.
-# Licensees having purchased or holding a valid Flumotion Advanced
-# Streaming Server license may use this file in accordance with the
-# Flumotion Advanced Streaming Server Commercial License Agreement.
-# See "LICENSE.Flumotion" in the source distribution for more information.
-# Headers in this file shall remain intact.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, see <http://www.gnu.org/licenses/>.
 import unittest
 
 from pitivi.utils import loggable as log
 
-__version__ = "$Rev: 7162 $"
-
 
 class LogTester(log.Loggable):
     log_category = 'testlog'
@@ -154,9 +148,8 @@ class TestOwnLogHandler(TestWithHandler):
         TestWithHandler.setUp(self)
         self.tester = LogFunctionTester()
 
-    # test if our own log handler correctly mangles the message
-
     def test_own_log_handler_limited(self):
+        """Checks our own log handler correctly mangles the message."""
         log.set_debug("testlog:%d" % log.INFO)
         log.add_log_handler(self.handler)
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]