intelmq-extensions 1.11.1__tar.gz → 1.11.2__tar.gz

{intelmq_extensions-1.11.1 → intelmq_extensions-1.11.2}/PKG-INFO

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

{intelmq_extensions-1.11.1 → intelmq_extensions-1.11.2}/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-1.11.1 → intelmq_extensions-1.11.2}/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.1 → intelmq_extensions-1.11.2}/intelmq_extensions.egg-info/PKG-INFO

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

{intelmq_extensions-1.11.1 → intelmq_extensions-1.11.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "intelmq_extensions"
-version = "1.11.1"
+version = "1.11.2"
 description = "Additional bots for IntelMQ"
 readme = "README.md"
 requires-python = ">=3.10"

{intelmq_extensions-1.11.1 → intelmq_extensions-1.11.2}/intelmq_extensions.egg-info/requires.txt

@@ -1,15 +1,15 @@
+netaddr>=0.7.14
 intelmq
+mergedeep
+tabulate>=0.7.5
+psycopg2-binary>=2.5.5
+python-termstyle>=0.1.10
 rt<3.0.0,>=1.0.9
-psycopg2-binary
 netaddr>=0.7.14
 schwifty
-tabulate>=0.7.5
 schwifty
-psycopg2-binary>=2.5.5
-python-termstyle>=0.1.10
+psycopg2-binary
 slixmpp
-netaddr>=0.7.14
-mergedeep
 
 [:python_version < "3.8"]
 importlib_metadata