Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drop python2 support in wmi.py and ese.py #1804

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions impacket/dcerpc/v5/dcom/wmi.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import collections.abc
import logging
import six
from collections import OrderedDict

from impacket.dcerpc.v5.ndr import NDRSTRUCT, NDRUniConformantArray, NDRPOINTER, NDRUniConformantVaryingArray, NDRUNION, \
NDRENUM
Expand Down Expand Up @@ -57,13 +58,6 @@ def format_structure(d, level=0):
else:
x = str(d)
return x
try:
from collections import OrderedDict
except:
try:
from ordereddict.ordereddict import OrderedDict
except:
from ordereddict import OrderedDict

class DCERPCSessionError(DCERPCException):
def __init__(self, error_string=None, error_code=None, packet=None):
Expand Down
8 changes: 1 addition & 7 deletions impacket/ese.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,7 @@
from __future__ import division
from __future__ import print_function
from impacket import LOG
try:
from collections import OrderedDict
except:
try:
from ordereddict.ordereddict import OrderedDict
except:
from ordereddict import OrderedDict
from collections import OrderedDict
from impacket.structure import Structure, hexdump
from struct import unpack
from binascii import hexlify
Expand Down
Loading