Compare commits
26 Commits
Author | SHA256 | Date | |
---|---|---|---|
dbc8c0294a | |||
ded5091e85 | |||
ce3c88bf83 | |||
05566c48db | |||
b0cdbcf443 | |||
8a7846804e | |||
f601ea61a9 | |||
49a2435c6a | |||
ee9800c4fa | |||
f0489d5456 | |||
8c4dea129f | |||
b44a00205c | |||
96269f907c | |||
244c089206 | |||
88978b5c62 | |||
1d779b859f | |||
|
efd14845bf | ||
4687a911aa | |||
|
188f7d3da5 | ||
bd24cac60e | |||
e6f6687785 | |||
7f5d852c0e | |||
782ebebd0e | |||
f160c25ed0 | |||
f8e396d603 | |||
b064a72596 |
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:bd15a15020aee8376cab5be264c26330824a8b8164ed0195bd402dd59e4e8f7c
|
|
||||||
size 93985
|
|
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:e42bcd3961de71d58186f7a7fa6adac133701ae74cd19e6376289d89593b0af2
|
|
||||||
size 124064
|
|
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:cffc1d018325d1810ad4554589ad113575dd2ae071409feb1fe1e1f0b56cd236
|
|
||||||
size 122568
|
|
@@ -1,69 +0,0 @@
|
|||||||
From 01d0774948da432f39c5a89622d676e91b8c47af Mon Sep 17 00:00:00 2001
|
|
||||||
From: Steve Kowalik <steven@wedontsleep.org>
|
|
||||||
Date: Wed, 9 Oct 2024 17:20:45 +1100
|
|
||||||
Subject: [PATCH] Remove use of str2octs from pyasn1
|
|
||||||
|
|
||||||
pyasn1 has been removing all Python 2 code from its codebase, and the
|
|
||||||
octets module has been removed from 0.6.1 onwards. Since we only support
|
|
||||||
Python 3.8, we can remove it and just encode to bytes.
|
|
||||||
---
|
|
||||||
tests/test_objecttype_smiv2_pysnmp.py | 11 +++++------
|
|
||||||
1 file changed, 5 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/tests/test_objecttype_smiv2_pysnmp.py b/tests/test_objecttype_smiv2_pysnmp.py
|
|
||||||
index fdec37e..b374332 100644
|
|
||||||
--- a/tests/test_objecttype_smiv2_pysnmp.py
|
|
||||||
+++ b/tests/test_objecttype_smiv2_pysnmp.py
|
|
||||||
@@ -13,7 +13,6 @@
|
|
||||||
except ImportError:
|
|
||||||
import unittest
|
|
||||||
|
|
||||||
-from pyasn1.compat.octets import str2octs
|
|
||||||
from pysmi.parser.smi import parserFactory
|
|
||||||
from pysmi.codegen.pysnmp import PySnmpCodeGen
|
|
||||||
from pysmi.codegen.symtable import SymtableCodeGen
|
|
||||||
@@ -75,7 +74,7 @@ def testObjectTypeStatus(self):
|
|
||||||
# TODO:revisit
|
|
||||||
# def testObjectTypeReference(self):
|
|
||||||
# self.assertEqual(
|
|
||||||
- # self.ctx['testObjectType'].getReference(), str2octs('ABC'),
|
|
||||||
+ # self.ctx['testObjectType'].getReference(), 'ABC'.encode('iso-8859-1'),
|
|
||||||
# 'bad REFERENCE'
|
|
||||||
# )
|
|
||||||
|
|
||||||
@@ -335,7 +334,7 @@ def setUp(self):
|
|
||||||
# TODO: pyasn1 does not like OctetString.defaultValue
|
|
||||||
def testObjectTypeSyntax(self):
|
|
||||||
self.assertEqual(
|
|
||||||
- self.ctx["testObjectType"].getSyntax(), str2octs("test value"), "bad DEFVAL"
|
|
||||||
+ self.ctx["testObjectType"].getSyntax(), "test value".encode('iso-8859-1'), "bad DEFVAL"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
@@ -374,7 +373,7 @@ def setUp(self):
|
|
||||||
def testObjectTypeSyntax(self):
|
|
||||||
self.assertEqual(
|
|
||||||
self.ctx["testObjectType"].getSyntax(),
|
|
||||||
- str2octs("\\ntest\nvalue\\"),
|
|
||||||
+ "\\ntest\nvalue\\".encode('iso-8859-1'),
|
|
||||||
"bad DEFVAL",
|
|
||||||
)
|
|
||||||
|
|
||||||
@@ -488,7 +487,7 @@ def setUp(self):
|
|
||||||
def testObjectTypeSyntax(self):
|
|
||||||
self.assertEqual(
|
|
||||||
self.ctx["testObjectType"].getSyntax().clone(""),
|
|
||||||
- str2octs(""),
|
|
||||||
+ "".encode('iso-8859-1'),
|
|
||||||
"bad size constrained SYNTAX",
|
|
||||||
)
|
|
||||||
|
|
||||||
@@ -526,7 +525,7 @@ def setUp(self):
|
|
||||||
def testObjectTypeSyntax(self):
|
|
||||||
self.assertEqual(
|
|
||||||
self.ctx["testObjectType"].getSyntax().clone(("set",)),
|
|
||||||
- str2octs("@"),
|
|
||||||
+ "@".encode('iso-8859-1'),
|
|
||||||
"bad BITS SYNTAX",
|
|
||||||
)
|
|
||||||
|
|
Reference in New Issue
Block a user