Merge pull request #3163 from nexB/3162-wurfl-license

Detect wurfl commercial license

Author: pombredanne

etc/scripts/licenses/buildrules.py

@@ -79,7 +79,7 @@ def load_data(location="00-new-licenses.txt"):
     Load rules metadata  and text from file at ``location``. Return a list of
     RuleData.
     """
-    with io.open(location, encoding="utf-8") as o:
+    with open(location) as o:
         lines = o.read().splitlines(False)
 
     rules = []
@@ -262,7 +262,7 @@ def cli(licenses_file):
             print(existing_msg.format(**locals()))
             continue
         else:
-            print(f"Adding new rule: {identifier}")
+            print(f"Adding new rule: file://{identifier}")
             rl = models.update_ignorables(rulerec, verbose=False)
             rl.dump(rules_data_dir=models.rules_data_dir)
 

src/licensedcode/data/rules/commercial-license_80.RULE

@@ -0,0 +1,11 @@
+---
+license_expression: commercial-license
+is_license_notice: yes
+notes: Seen in wurfl.h https://github.com/haproxy/haproxy/commit/cd9b9bd3e47cb2814eaab6c07d1facf222f013a9#diff-be9afa6e330d524179c2f689a4858fd7645bb3d1f05e54871b962f829f2580e8
+---
+
+This software package is the property of ScientiaMobile Inc. and is licensed
+commercially according to a contract between the Licensee and ScientiaMobile Inc. (Licensor).
+If you represent the Licensee, please refer to the licensing agreement which has been signed
+between the two parties. If you do not represent the Licensee, you are not authorized to use
+this software in any way.

src/licensedcode/data/rules/commercial-license_81.RULE

@@ -0,0 +1,8 @@
+---
+license_expression: commercial-license
+is_license_notice: yes
+relevance: 100
+notes: Seen in wurfl.h https://github.com/haproxy/haproxy/commit/cd9b9bd3e47cb2814eaab6c07d1facf222f013a9#diff-be9afa6e330d524179c2f689a4858fd7645bb3d1f05e54871b962f829f2580e8
+---
+
+software package is the property

src/licensedcode/data/rules/commercial-license_82.RULE

@@ -0,0 +1,8 @@
+---
+license_expression: commercial-license
+is_license_notice: yes
+relevance: 100
+notes: Seen in wurfl.h https://github.com/haproxy/haproxy/commit/cd9b9bd3e47cb2814eaab6c07d1facf222f013a9#diff-be9afa6e330d524179c2f689a4858fd7645bb3d1f05e54871b962f829f2580e8
+---
+
+licensed commercially

src/licensedcode/data/rules/commercial-license_83.RULE

@@ -0,0 +1,8 @@
+---
+license_expression: commercial-license
+is_license_notice: yes
+relevance: 100
+notes: Seen in wurfl.h https://github.com/haproxy/haproxy/commit/cd9b9bd3e47cb2814eaab6c07d1facf222f013a9#diff-be9afa6e330d524179c2f689a4858fd7645bb3d1f05e54871b962f829f2580e8
+---
+
+licensed commercially according to a contract

src/licensedcode/data/rules/commercial-license_84.RULE

@@ -0,0 +1,8 @@
+---
+license_expression: commercial-license
+is_license_notice: yes
+relevance: 100
+notes: Seen in wurfl.h https://github.com/haproxy/haproxy/commit/cd9b9bd3e47cb2814eaab6c07d1facf222f013a9#diff-be9afa6e330d524179c2f689a4858fd7645bb3d1f05e54871b962f829f2580e8
+---
+
+refer to the licensing agreement which has been signed

src/licensedcode/data/rules/commercial-license_85.RULE

@@ -0,0 +1,8 @@
+---
+license_expression: commercial-license
+is_license_notice: yes
+relevance: 100
+notes: Seen in wurfl.h https://github.com/haproxy/haproxy/commit/cd9b9bd3e47cb2814eaab6c07d1facf222f013a9#diff-be9afa6e330d524179c2f689a4858fd7645bb3d1f05e54871b962f829f2580e8
+---
+
+you are not authorized to use this software in any way.

src/licensedcode/data/rules/commercial-license_86.RULE

@@ -0,0 +1,8 @@
+---
+license_expression: commercial-license
+is_license_notice: yes
+relevance: 100
+notes: Seen in wurfl.h https://github.com/haproxy/haproxy/commit/cd9b9bd3e47cb2814eaab6c07d1facf222f013a9#diff-be9afa6e330d524179c2f689a4858fd7645bb3d1f05e54871b962f829f2580e8
+---
+
+not authorized to use this software

src/licensedcode/models.py

@@ -425,20 +425,13 @@ def dump(self, licenses_data_dir):
          - the license data as YAML frontmatter
          - the license text
         """
-
-        def write(location, byte_string):
-            # we write as binary because rules and licenses texts and data are
-            # UTF-8-encoded bytes
-            with io.open(location, 'wb') as of:
-                of.write(byte_string)
-
         metadata = self.to_dict()
-        content = self.text.encode('utf-8')
+        content = self.text
         rule_post = FrontmatterPost(content=content, handler=SaneYAMLHandler(), **metadata)
-        output_string = dumps_frontmatter(post=rule_post)
-
+        output = dumps_frontmatter(post=rule_post)
         license_file = self.license_file(licenses_data_dir=licenses_data_dir)
-        write(license_file, output_string.encode('utf-8'))
+        with open(license_file, 'w') as of:
+            of.write(output)
 
     def load(self, license_file, check_consistency=True):
         """
@@ -2078,19 +2071,14 @@ def dump(self, rules_data_dir):
         if self.is_from_license or self.is_synthetic:
             return
 
-        def write(location, byte_string):
-            # we write as binary because rules and licenses texts and data are
-            # UTF-8-encoded bytes
-            with io.open(location, 'wb') as of:
-                of.write(byte_string)
-
         rule_file = self.rule_file(rules_data_dir=rules_data_dir)
 
         metadata = self.to_dict()
-        content = self.text.encode('utf-8')
+        content = self.text
         rule_post = FrontmatterPost(content=content, handler=SaneYAMLHandler(), **metadata)
-        output_string = dumps_frontmatter(post=rule_post)
-        write(rule_file, output_string.encode('utf-8'))
+        output = dumps_frontmatter(post=rule_post)
+        with open(rule_file, 'w') as of:
+            of.write(output)
 
     def load(self, rule_file, with_checks=True):
         """

src/scancode/cli_test_utils.py

@@ -137,13 +137,8 @@ def run_scan_click(
 
 
 def get_opts(options):
-    try:
-        return ' '.join(options)
-    except:
-        try:
-            return b' '.join(options)
-        except:
-            return b' '.join(map(repr, options))
+    opts = [o if isinstance(o, str) else repr(o) for o in options]
+    return ' '.join(opts)
 
 
 WINDOWS_CI_TIMEOUT = '222.2'