intelmq-extensions 1.11.0__py3-none-any.whl → 1.11.2__py3-none-any.whl

intelmq_extensions/cli/intelmqcli.py

@@ -167,7 +167,7 @@ class IntelMQCLIContoller(lib.IntelMQCLIContollerTemplate):
                 if self.subject:
                     subject = self.subject
                 else:
-                    subject = "%s %s incidents on %s" "" % (
+                    subject = "%s %s incidents on %s" % (
                         len(event_ids),
                         lib.SUBJECT[taxonomy],
                         datetime.datetime.now().strftime("%Y-%m-%d"),
@@ -375,8 +375,11 @@ class IntelMQCLIContoller(lib.IntelMQCLIContollerTemplate):
         if description:
             self._collected_descriptions.add(description.replace("\\n", "\n"))
             # \\n - encoded new lines
-            row["event_description.text"] = description.replace("\n", " ").replace(
-                "\\n", " "
+            row["event_description.text"] = (
+                description.replace("\n", " ")
+                .replace("\\n", " ")
+                .replace("\\r", "")
+                .replace("\r", "")
             )
         return row
 
@@ -406,7 +409,7 @@ class IntelMQCLIContoller(lib.IntelMQCLIContollerTemplate):
         if self.subject:
             subject = self.subject
         else:
-            subject = "{tax} incidents in your network: {date}" "".format(
+            subject = "{tax} incidents in your network: {date}".format(
                 date=datetime.datetime.now().strftime("%Y-%m-%d"),
                 tax=lib.SUBJECT[taxonomy],
             )
@@ -441,9 +444,7 @@ To: {to}
 Subject: {subj}
 
 {text}
-    """.format(
-                to=requestor, subj=subject, text=text
-            )
+    """.format(to=requestor, subj=subject, text=text)
         )
         showed_text_len = showed_text.count("\n")
 
@@ -620,8 +621,9 @@ Subject: {subj}
             asns = set(str(row["source.asn"]) for row in query)
             answer = input(
                 inverted(
-                    "Save recipient {!r} for ASNs {!s}? [Y/n] "
-                    "".format(requestor, ", ".join(asns))
+                    "Save recipient {!r} for ASNs {!s}? [Y/n] ".format(
+                        requestor, ", ".join(asns)
+                    )
                 )
             ).strip()
             if answer.strip().lower() in ("", "y", "j"):

intelmq_extensions/tests/cli/test_intelmqcli.py

@@ -140,7 +140,7 @@ class TestConstituencySupport(CLITestCase):
                 "constituency": "energy",
                 "rtir_report_id": 20,
                 "event_description.text": (
-                    "Some very long description \n with \n\n multiple \n new lines."
+                    "Some very long description \n with \n\n multiple \r\n new lines."
                 ),
             }
         )

{intelmq_extensions-1.11.0.dist-info → intelmq_extensions-1.11.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: intelmq_extensions
-Version: 1.11.0
+Version: 1.11.2
 Summary: Additional bots for IntelMQ
 Author: CERT.at Data & Development Team
 License: AGPLv3
@@ -9,14 +9,15 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: intelmq
-Requires-Dist: rt<3.0.0,>=1.0.9
-Requires-Dist: mergedeep
-Requires-Dist: psycopg2-binary
-Requires-Dist: python-termstyle>=0.1.10
 Requires-Dist: importlib_metadata; python_version < "3.8"
-Requires-Dist: tabulate>=0.7.5
+Requires-Dist: psycopg2-binary
+Requires-Dist: schwifty
 Requires-Dist: netaddr>=0.7.14
+Requires-Dist: tabulate>=0.7.5
+Requires-Dist: mergedeep
+Requires-Dist: rt<3.0.0,>=1.0.9
+Requires-Dist: python-termstyle>=0.1.10
+Requires-Dist: intelmq
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: tox>=4; extra == "dev"

{intelmq_extensions-1.11.0.dist-info → intelmq_extensions-1.11.2.dist-info}/RECORD

@@ -48,7 +48,7 @@ intelmq_extensions/bots/parsers/modat/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCe
 intelmq_extensions/bots/parsers/modat/parser.py,sha256=VanWdV8RhTcqlwGlbrtJ848GG9s0DVSAPE93nGZhLpk,3165
 intelmq_extensions/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 intelmq_extensions/cli/create_reports.py,sha256=aPANN6VeHQhTSl6XT0SKulo9WhEuR1lFZVfWJ3TaOYk,5591
-intelmq_extensions/cli/intelmqcli.py,sha256=1DhGm_wAyyUEA45CEFkbLN-k29O9o6XPcSZFvjOc_Ls,24085
+intelmq_extensions/cli/intelmqcli.py,sha256=SeSJLipOSNU3bD5RiBnI_T6ApvBDPYeDN4lSF2kdqm4,24162
 intelmq_extensions/cli/lib.py,sha256=mrMuRVvd-nKd1ASVBhTZn28B13VIK6VVSv-MZO2FFx4,20767
 intelmq_extensions/cli/utils.py,sha256=CpK4rvYtJDYiW5CDhxtBwK7VIY-MOV6FSSEQpwf4HmE,410
 intelmq_extensions/etc/harmonization.conf,sha256=8kxVSdZEFE7ik1XL1np_vHd3CvTasQ8N4w5hUdMW3YU,25393
@@ -109,13 +109,13 @@ intelmq_extensions/tests/bots/parsers/modat/data.py,sha256=K4BVUxqm7zGHYittNmFC1
 intelmq_extensions/tests/bots/parsers/modat/test_parser.py,sha256=5Du2KG18F3BnvXrSckUojHoFSYyzWkyO24dMUqLlUMs,2401
 intelmq_extensions/tests/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 intelmq_extensions/tests/cli/test_create_reports.py,sha256=hZ-3lhNJJPhi9xetyMAG7k-G5crZ9kf0bbvQj-nMSrg,3343
-intelmq_extensions/tests/cli/test_intelmqcli.py,sha256=Izy0FHVkj44DCgp4Zm8f1vYTdl5wDyCP1sZV0xgMrgY,5009
+intelmq_extensions/tests/cli/test_intelmqcli.py,sha256=OlNGaHdSt01UCowOnzjcdUX3EcbGxlFH19_Xunypn9M,5011
 intelmq_extensions/tests/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 intelmq_extensions/tests/lib/base.py,sha256=iD4MuDq0Dh-CqFDgyXf4CfaJgT4AL7XAcNjPGxUlkPM,2560
 intelmq_extensions/tests/lib/test_api_helpers.py,sha256=cO6KNfVjwpYgevyyxxokOAmk7VXo-8T8OCH8hQhf980,3807
-intelmq_extensions-1.11.0.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-intelmq_extensions-1.11.0.dist-info/METADATA,sha256=qDzOhAYwk7v8i7femo3GVeaR-rh36mJKIEx6L3sJrzU,2843
-intelmq_extensions-1.11.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-intelmq_extensions-1.11.0.dist-info/entry_points.txt,sha256=jnG6ZRXmmS5fThseMCrqZ29xMsp-S2OVqiydmlLdpko,4597
-intelmq_extensions-1.11.0.dist-info/top_level.txt,sha256=YVqZnmAiBfQPNdJPAv64Afvc41p3B24Akx2v2-3BFyc,19
-intelmq_extensions-1.11.0.dist-info/RECORD,,
+intelmq_extensions-1.11.2.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+intelmq_extensions-1.11.2.dist-info/METADATA,sha256=vPzSRcrxJUITu5irshqd0eKr2ZUGy44k39Uq5UM1jWs,2867
+intelmq_extensions-1.11.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+intelmq_extensions-1.11.2.dist-info/entry_points.txt,sha256=jnG6ZRXmmS5fThseMCrqZ29xMsp-S2OVqiydmlLdpko,4597
+intelmq_extensions-1.11.2.dist-info/top_level.txt,sha256=YVqZnmAiBfQPNdJPAv64Afvc41p3B24Akx2v2-3BFyc,19
+intelmq_extensions-1.11.2.dist-info/RECORD,,

{intelmq_extensions-1.11.0.dist-info → intelmq_extensions-1.11.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any