[pywin32-checkins] pywin32/win32/Lib netbios.py, 1.4.4.2, 1.4.4.3 win32inetcon.py, 1.1, 1.1.4.1
OLD project page for the Python extensions for Windows
Brought to you by:
mhammond
Menu
▾
▴
[pywin32-checkins] pywin32/win32/Lib netbios.py, 1.4.4.2, 1.4.4.3 win32inetcon.py, 1.1, 1.1.4.1
|
From: Mark H. <mha...@us...> - 2008-12-11 04:13:47
|
Update of /cvsroot/pywin32/pywin32/win32/Lib In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26275/win32/Lib Modified Files: Tag: py3k netbios.py win32inetcon.py Log Message: merge lots of changes from the trunk Index: win32inetcon.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/win32inetcon.py,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** win32inetcon.py 12 Jun 2004 13:40:34 -0000 1.1 --- win32inetcon.py 11 Dec 2008 04:13:35 -0000 1.1.4.1 *************** *** 1,7 **** # Generated by h2py from \mssdk\include\WinInet.h - # Included from pshpack8.h - - # Included from pshpack4.h INTERNET_INVALID_PORT_NUMBER = 0 INTERNET_DEFAULT_FTP_PORT = 21 --- 1,4 ---- *************** *** 725,727 **** PRIVACY_TYPE_THIRD_PARTY = 1 ! # Included from poppack.h --- 722,1103 ---- PRIVACY_TYPE_THIRD_PARTY = 1 ! # Generated by h2py from winhttp.h ! INTERNET_DEFAULT_PORT = 0 ! INTERNET_DEFAULT_HTTP_PORT = 80 ! INTERNET_DEFAULT_HTTPS_PORT = 443 ! WINHTTP_FLAG_ASYNC = 0x10000000 ! WINHTTP_FLAG_SECURE = 0x00800000 ! WINHTTP_FLAG_ESCAPE_PERCENT = 0x00000004 ! WINHTTP_FLAG_NULL_CODEPAGE = 0x00000008 ! WINHTTP_FLAG_BYPASS_PROXY_CACHE = 0x00000100 ! WINHTTP_FLAG_REFRESH = WINHTTP_FLAG_BYPASS_PROXY_CACHE ! WINHTTP_FLAG_ESCAPE_DISABLE = 0x00000040 ! WINHTTP_FLAG_ESCAPE_DISABLE_QUERY = 0x00000080 ! SECURITY_FLAG_IGNORE_UNKNOWN_CA = 0x00000100 ! SECURITY_FLAG_IGNORE_CERT_DATE_INVALID = 0x00002000 ! SECURITY_FLAG_IGNORE_CERT_CN_INVALID = 0x00001000 ! SECURITY_FLAG_IGNORE_CERT_WRONG_USAGE = 0x00000200 ! INTERNET_SCHEME_HTTP = (1) ! INTERNET_SCHEME_HTTPS = (2) ! WINHTTP_AUTOPROXY_AUTO_DETECT = 0x00000001 ! WINHTTP_AUTOPROXY_CONFIG_URL = 0x00000002 ! WINHTTP_AUTOPROXY_RUN_INPROCESS = 0x00010000 ! WINHTTP_AUTOPROXY_RUN_OUTPROCESS_ONLY = 0x00020000 ! WINHTTP_AUTO_DETECT_TYPE_DHCP = 0x00000001 ! WINHTTP_AUTO_DETECT_TYPE_DNS_A = 0x00000002 ! WINHTTP_TIME_FORMAT_BUFSIZE = 62 ! ICU_NO_ENCODE = 0x20000000 ! ICU_DECODE = 0x10000000 ! ICU_NO_META = 0x08000000 ! ICU_ENCODE_SPACES_ONLY = 0x04000000 ! ICU_BROWSER_MODE = 0x02000000 ! ICU_ENCODE_PERCENT = 0x00001000 ! ICU_ESCAPE = (-2147483648) ! ICU_ESCAPE_AUTHORITY = 0x00002000 ! ICU_REJECT_USERPWD = 0x00004000 ! WINHTTP_ACCESS_TYPE_DEFAULT_PROXY = 0 ! WINHTTP_ACCESS_TYPE_NO_PROXY = 1 ! WINHTTP_ACCESS_TYPE_NAMED_PROXY = 3 ! WINHTTP_OPTION_CALLBACK = 1 ! WINHTTP_OPTION_RESOLVE_TIMEOUT = 2 ! WINHTTP_OPTION_CONNECT_TIMEOUT = 3 ! WINHTTP_OPTION_CONNECT_RETRIES = 4 ! WINHTTP_OPTION_SEND_TIMEOUT = 5 ! WINHTTP_OPTION_RECEIVE_TIMEOUT = 6 ! WINHTTP_OPTION_RECEIVE_RESPONSE_TIMEOUT = 7 ! WINHTTP_OPTION_HANDLE_TYPE = 9 ! WINHTTP_OPTION_READ_BUFFER_SIZE = 12 ! WINHTTP_OPTION_WRITE_BUFFER_SIZE = 13 ! WINHTTP_OPTION_PARENT_HANDLE = 21 ! WINHTTP_OPTION_EXTENDED_ERROR = 24 ! WINHTTP_OPTION_SECURITY_FLAGS = 31 ! WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT = 32 ! WINHTTP_OPTION_URL = 34 ! WINHTTP_OPTION_SECURITY_KEY_BITNESS = 36 ! WINHTTP_OPTION_PROXY = 38 ! WINHTTP_OPTION_USER_AGENT = 41 ! WINHTTP_OPTION_CONTEXT_VALUE = 45 ! WINHTTP_OPTION_CLIENT_CERT_CONTEXT = 47 ! WINHTTP_OPTION_REQUEST_PRIORITY = 58 ! WINHTTP_OPTION_HTTP_VERSION = 59 ! WINHTTP_OPTION_DISABLE_FEATURE = 63 ! WINHTTP_OPTION_CODEPAGE = 68 ! WINHTTP_OPTION_MAX_CONNS_PER_SERVER = 73 ! WINHTTP_OPTION_MAX_CONNS_PER_1_0_SERVER = 74 ! WINHTTP_OPTION_AUTOLOGON_POLICY = 77 ! WINHTTP_OPTION_SERVER_CERT_CONTEXT = 78 ! WINHTTP_OPTION_ENABLE_FEATURE = 79 ! WINHTTP_OPTION_WORKER_THREAD_COUNT = 80 ! WINHTTP_OPTION_PASSPORT_COBRANDING_TEXT = 81 ! WINHTTP_OPTION_PASSPORT_COBRANDING_URL = 82 ! WINHTTP_OPTION_CONFIGURE_PASSPORT_AUTH = 83 ! WINHTTP_OPTION_SECURE_PROTOCOLS = 84 ! WINHTTP_OPTION_ENABLETRACING = 85 ! WINHTTP_OPTION_PASSPORT_SIGN_OUT = 86 ! WINHTTP_OPTION_PASSPORT_RETURN_URL = 87 ! WINHTTP_OPTION_REDIRECT_POLICY = 88 ! WINHTTP_OPTION_MAX_HTTP_AUTOMATIC_REDIRECTS = 89 ! WINHTTP_OPTION_MAX_HTTP_STATUS_CONTINUE = 90 ! WINHTTP_OPTION_MAX_RESPONSE_HEADER_SIZE = 91 ! WINHTTP_OPTION_MAX_RESPONSE_DRAIN_SIZE = 92 ! WINHTTP_OPTION_CONNECTION_INFO = 93 ! WINHTTP_OPTION_CLIENT_CERT_ISSUER_LIST = 94 ! WINHTTP_OPTION_SPN = 96 ! WINHTTP_OPTION_GLOBAL_PROXY_CREDS = 97 ! WINHTTP_OPTION_GLOBAL_SERVER_CREDS = 98 ! WINHTTP_OPTION_UNLOAD_NOTIFY_EVENT = 99 ! WINHTTP_OPTION_REJECT_USERPWD_IN_URL = 100 ! WINHTTP_OPTION_USE_GLOBAL_SERVER_CREDENTIALS = 101 ! WINHTTP_LAST_OPTION = WINHTTP_OPTION_USE_GLOBAL_SERVER_CREDENTIALS ! WINHTTP_OPTION_USERNAME = 0x1000 ! WINHTTP_OPTION_PASSWORD = 0x1001 ! WINHTTP_OPTION_PROXY_USERNAME = 0x1002 ! WINHTTP_OPTION_PROXY_PASSWORD = 0x1003 ! WINHTTP_CONNS_PER_SERVER_UNLIMITED = (-1) ! WINHTTP_AUTOLOGON_SECURITY_LEVEL_MEDIUM = 0 ! WINHTTP_AUTOLOGON_SECURITY_LEVEL_LOW = 1 ! WINHTTP_AUTOLOGON_SECURITY_LEVEL_HIGH = 2 ! WINHTTP_AUTOLOGON_SECURITY_LEVEL_DEFAULT = WINHTTP_AUTOLOGON_SECURITY_LEVEL_MEDIUM ! WINHTTP_OPTION_REDIRECT_POLICY_NEVER = 0 ! WINHTTP_OPTION_REDIRECT_POLICY_DISALLOW_HTTPS_TO_HTTP = 1 ! WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS = 2 ! WINHTTP_OPTION_REDIRECT_POLICY_LAST = WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS ! WINHTTP_OPTION_REDIRECT_POLICY_DEFAULT = WINHTTP_OPTION_REDIRECT_POLICY_DISALLOW_HTTPS_TO_HTTP ! WINHTTP_DISABLE_PASSPORT_AUTH = 0x00000000 ! WINHTTP_ENABLE_PASSPORT_AUTH = 0x10000000 ! WINHTTP_DISABLE_PASSPORT_KEYRING = 0x20000000 ! WINHTTP_ENABLE_PASSPORT_KEYRING = 0x40000000 ! WINHTTP_DISABLE_COOKIES = 0x00000001 ! WINHTTP_DISABLE_REDIRECTS = 0x00000002 ! WINHTTP_DISABLE_AUTHENTICATION = 0x00000004 ! WINHTTP_DISABLE_KEEP_ALIVE = 0x00000008 ! WINHTTP_ENABLE_SSL_REVOCATION = 0x00000001 ! WINHTTP_ENABLE_SSL_REVERT_IMPERSONATION = 0x00000002 ! WINHTTP_DISABLE_SPN_SERVER_PORT = 0x00000000 ! WINHTTP_ENABLE_SPN_SERVER_PORT = 0x00000001 ! WINHTTP_OPTION_SPN_MASK = WINHTTP_ENABLE_SPN_SERVER_PORT ! WINHTTP_HANDLE_TYPE_SESSION = 1 ! WINHTTP_HANDLE_TYPE_CONNECT = 2 ! WINHTTP_HANDLE_TYPE_REQUEST = 3 ! WINHTTP_AUTH_SCHEME_BASIC = 0x00000001 ! WINHTTP_AUTH_SCHEME_NTLM = 0x00000002 ! WINHTTP_AUTH_SCHEME_PASSPORT = 0x00000004 ! WINHTTP_AUTH_SCHEME_DIGEST = 0x00000008 ! WINHTTP_AUTH_SCHEME_NEGOTIATE = 0x00000010 ! WINHTTP_AUTH_TARGET_SERVER = 0x00000000 ! WINHTTP_AUTH_TARGET_PROXY = 0x00000001 ! SECURITY_FLAG_SECURE = 0x00000001 ! SECURITY_FLAG_STRENGTH_WEAK = 0x10000000 ! SECURITY_FLAG_STRENGTH_MEDIUM = 0x40000000 ! SECURITY_FLAG_STRENGTH_STRONG = 0x20000000 ! WINHTTP_CALLBACK_STATUS_FLAG_CERT_REV_FAILED = 0x00000001 ! WINHTTP_CALLBACK_STATUS_FLAG_INVALID_CERT = 0x00000002 ! WINHTTP_CALLBACK_STATUS_FLAG_CERT_REVOKED = 0x00000004 ! WINHTTP_CALLBACK_STATUS_FLAG_INVALID_CA = 0x00000008 ! WINHTTP_CALLBACK_STATUS_FLAG_CERT_CN_INVALID = 0x00000010 ! WINHTTP_CALLBACK_STATUS_FLAG_CERT_DATE_INVALID = 0x00000020 ! WINHTTP_CALLBACK_STATUS_FLAG_CERT_WRONG_USAGE = 0x00000040 ! WINHTTP_CALLBACK_STATUS_FLAG_SECURITY_CHANNEL_ERROR = (-2147483648) ! WINHTTP_FLAG_SECURE_PROTOCOL_SSL2 = 0x00000008 ! WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 = 0x00000020 ! WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 = 0x00000080 ! WINHTTP_FLAG_SECURE_PROTOCOL_ALL = (WINHTTP_FLAG_SECURE_PROTOCOL_SSL2 | \ ! WINHTTP_FLAG_SECURE_PROTOCOL_SSL3 | \ ! WINHTTP_FLAG_SECURE_PROTOCOL_TLS1) ! WINHTTP_CALLBACK_STATUS_RESOLVING_NAME = 0x00000001 ! WINHTTP_CALLBACK_STATUS_NAME_RESOLVED = 0x00000002 ! WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER = 0x00000004 ! WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER = 0x00000008 ! WINHTTP_CALLBACK_STATUS_SENDING_REQUEST = 0x00000010 ! WINHTTP_CALLBACK_STATUS_REQUEST_SENT = 0x00000020 ! WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE = 0x00000040 ! WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED = 0x00000080 ! WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION = 0x00000100 ! WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED = 0x00000200 ! WINHTTP_CALLBACK_STATUS_HANDLE_CREATED = 0x00000400 ! WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING = 0x00000800 ! WINHTTP_CALLBACK_STATUS_DETECTING_PROXY = 0x00001000 ! WINHTTP_CALLBACK_STATUS_REDIRECT = 0x00004000 ! WINHTTP_CALLBACK_STATUS_INTERMEDIATE_RESPONSE = 0x00008000 ! WINHTTP_CALLBACK_STATUS_SECURE_FAILURE = 0x00010000 ! WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE = 0x00020000 ! WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE = 0x00040000 ! WINHTTP_CALLBACK_STATUS_READ_COMPLETE = 0x00080000 ! WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE = 0x00100000 ! WINHTTP_CALLBACK_STATUS_REQUEST_ERROR = 0x00200000 ! WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE = 0x00400000 ! API_RECEIVE_RESPONSE = (1) ! API_QUERY_DATA_AVAILABLE = (2) ! API_READ_DATA = (3) ! API_WRITE_DATA = (4) ! API_SEND_REQUEST = (5) ! WINHTTP_CALLBACK_FLAG_RESOLVE_NAME = (WINHTTP_CALLBACK_STATUS_RESOLVING_NAME | WINHTTP_CALLBACK_STATUS_NAME_RESOLVED) ! WINHTTP_CALLBACK_FLAG_CONNECT_TO_SERVER = (WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER | WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER) ! WINHTTP_CALLBACK_FLAG_SEND_REQUEST = (WINHTTP_CALLBACK_STATUS_SENDING_REQUEST | WINHTTP_CALLBACK_STATUS_REQUEST_SENT) ! WINHTTP_CALLBACK_FLAG_RECEIVE_RESPONSE = (WINHTTP_CALLBACK_STATUS_RECEIVING_RESPONSE | WINHTTP_CALLBACK_STATUS_RESPONSE_RECEIVED) ! WINHTTP_CALLBACK_FLAG_CLOSE_CONNECTION = (WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION | WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED) ! WINHTTP_CALLBACK_FLAG_HANDLES = (WINHTTP_CALLBACK_STATUS_HANDLE_CREATED | WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING) ! WINHTTP_CALLBACK_FLAG_DETECTING_PROXY = WINHTTP_CALLBACK_STATUS_DETECTING_PROXY ! WINHTTP_CALLBACK_FLAG_REDIRECT = WINHTTP_CALLBACK_STATUS_REDIRECT ! WINHTTP_CALLBACK_FLAG_INTERMEDIATE_RESPONSE = WINHTTP_CALLBACK_STATUS_INTERMEDIATE_RESPONSE ! WINHTTP_CALLBACK_FLAG_SECURE_FAILURE = WINHTTP_CALLBACK_STATUS_SECURE_FAILURE ! WINHTTP_CALLBACK_FLAG_SENDREQUEST_COMPLETE = WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE ! WINHTTP_CALLBACK_FLAG_HEADERS_AVAILABLE = WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE ! WINHTTP_CALLBACK_FLAG_DATA_AVAILABLE = WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE ! WINHTTP_CALLBACK_FLAG_READ_COMPLETE = WINHTTP_CALLBACK_STATUS_READ_COMPLETE ! WINHTTP_CALLBACK_FLAG_WRITE_COMPLETE = WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE ! WINHTTP_CALLBACK_FLAG_REQUEST_ERROR = WINHTTP_CALLBACK_STATUS_REQUEST_ERROR ! WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS = (WINHTTP_CALLBACK_STATUS_SENDREQUEST_COMPLETE \ ! | WINHTTP_CALLBACK_STATUS_HEADERS_AVAILABLE \ ! | WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE \ ! | WINHTTP_CALLBACK_STATUS_READ_COMPLETE \ ! | WINHTTP_CALLBACK_STATUS_WRITE_COMPLETE \ ! | WINHTTP_CALLBACK_STATUS_REQUEST_ERROR) ! WINHTTP_CALLBACK_FLAG_ALL_NOTIFICATIONS = (-1) ! WINHTTP_QUERY_MIME_VERSION = 0 ! WINHTTP_QUERY_CONTENT_TYPE = 1 ! WINHTTP_QUERY_CONTENT_TRANSFER_ENCODING = 2 ! WINHTTP_QUERY_CONTENT_ID = 3 ! WINHTTP_QUERY_CONTENT_DESCRIPTION = 4 ! WINHTTP_QUERY_CONTENT_LENGTH = 5 ! WINHTTP_QUERY_CONTENT_LANGUAGE = 6 ! WINHTTP_QUERY_ALLOW = 7 ! WINHTTP_QUERY_PUBLIC = 8 ! WINHTTP_QUERY_DATE = 9 ! WINHTTP_QUERY_EXPIRES = 10 ! WINHTTP_QUERY_LAST_MODIFIED = 11 ! WINHTTP_QUERY_MESSAGE_ID = 12 ! WINHTTP_QUERY_URI = 13 ! WINHTTP_QUERY_DERIVED_FROM = 14 ! WINHTTP_QUERY_COST = 15 ! WINHTTP_QUERY_LINK = 16 ! WINHTTP_QUERY_PRAGMA = 17 ! WINHTTP_QUERY_VERSION = 18 ! WINHTTP_QUERY_STATUS_CODE = 19 ! WINHTTP_QUERY_STATUS_TEXT = 20 ! WINHTTP_QUERY_RAW_HEADERS = 21 ! WINHTTP_QUERY_RAW_HEADERS_CRLF = 22 ! WINHTTP_QUERY_CONNECTION = 23 ! WINHTTP_QUERY_ACCEPT = 24 ! WINHTTP_QUERY_ACCEPT_CHARSET = 25 ! WINHTTP_QUERY_ACCEPT_ENCODING = 26 ! WINHTTP_QUERY_ACCEPT_LANGUAGE = 27 ! WINHTTP_QUERY_AUTHORIZATION = 28 ! WINHTTP_QUERY_CONTENT_ENCODING = 29 ! WINHTTP_QUERY_FORWARDED = 30 ! WINHTTP_QUERY_FROM = 31 ! WINHTTP_QUERY_IF_MODIFIED_SINCE = 32 ! WINHTTP_QUERY_LOCATION = 33 ! WINHTTP_QUERY_ORIG_URI = 34 ! WINHTTP_QUERY_REFERER = 35 ! WINHTTP_QUERY_RETRY_AFTER = 36 ! WINHTTP_QUERY_SERVER = 37 ! WINHTTP_QUERY_TITLE = 38 ! WINHTTP_QUERY_USER_AGENT = 39 ! WINHTTP_QUERY_WWW_AUTHENTICATE = 40 ! WINHTTP_QUERY_PROXY_AUTHENTICATE = 41 ! WINHTTP_QUERY_ACCEPT_RANGES = 42 ! WINHTTP_QUERY_SET_COOKIE = 43 ! WINHTTP_QUERY_COOKIE = 44 ! WINHTTP_QUERY_REQUEST_METHOD = 45 ! WINHTTP_QUERY_REFRESH = 46 ! WINHTTP_QUERY_CONTENT_DISPOSITION = 47 ! WINHTTP_QUERY_AGE = 48 ! WINHTTP_QUERY_CACHE_CONTROL = 49 ! WINHTTP_QUERY_CONTENT_BASE = 50 ! WINHTTP_QUERY_CONTENT_LOCATION = 51 ! WINHTTP_QUERY_CONTENT_MD5 = 52 ! WINHTTP_QUERY_CONTENT_RANGE = 53 ! WINHTTP_QUERY_ETAG = 54 ! WINHTTP_QUERY_HOST = 55 ! WINHTTP_QUERY_IF_MATCH = 56 ! WINHTTP_QUERY_IF_NONE_MATCH = 57 ! WINHTTP_QUERY_IF_RANGE = 58 ! WINHTTP_QUERY_IF_UNMODIFIED_SINCE = 59 ! WINHTTP_QUERY_MAX_FORWARDS = 60 ! WINHTTP_QUERY_PROXY_AUTHORIZATION = 61 ! WINHTTP_QUERY_RANGE = 62 ! WINHTTP_QUERY_TRANSFER_ENCODING = 63 ! WINHTTP_QUERY_UPGRADE = 64 ! WINHTTP_QUERY_VARY = 65 ! WINHTTP_QUERY_VIA = 66 ! WINHTTP_QUERY_WARNING = 67 ! WINHTTP_QUERY_EXPECT = 68 ! WINHTTP_QUERY_PROXY_CONNECTION = 69 ! WINHTTP_QUERY_UNLESS_MODIFIED_SINCE = 70 ! WINHTTP_QUERY_PROXY_SUPPORT = 75 ! WINHTTP_QUERY_AUTHENTICATION_INFO = 76 ! WINHTTP_QUERY_PASSPORT_URLS = 77 ! WINHTTP_QUERY_PASSPORT_CONFIG = 78 ! WINHTTP_QUERY_MAX = 78 ! WINHTTP_QUERY_CUSTOM = 65535 ! WINHTTP_QUERY_FLAG_REQUEST_HEADERS = (-2147483648) ! WINHTTP_QUERY_FLAG_SYSTEMTIME = 0x40000000 ! WINHTTP_QUERY_FLAG_NUMBER = 0x20000000 ! HTTP_STATUS_CONTINUE = 100 ! HTTP_STATUS_SWITCH_PROTOCOLS = 101 ! HTTP_STATUS_OK = 200 ! HTTP_STATUS_CREATED = 201 ! HTTP_STATUS_ACCEPTED = 202 ! HTTP_STATUS_PARTIAL = 203 ! HTTP_STATUS_NO_CONTENT = 204 ! HTTP_STATUS_RESET_CONTENT = 205 ! HTTP_STATUS_PARTIAL_CONTENT = 206 ! HTTP_STATUS_WEBDAV_MULTI_STATUS = 207 ! HTTP_STATUS_AMBIGUOUS = 300 ! HTTP_STATUS_MOVED = 301 ! HTTP_STATUS_REDIRECT = 302 ! HTTP_STATUS_REDIRECT_METHOD = 303 ! HTTP_STATUS_NOT_MODIFIED = 304 ! HTTP_STATUS_USE_PROXY = 305 ! HTTP_STATUS_REDIRECT_KEEP_VERB = 307 ! HTTP_STATUS_BAD_REQUEST = 400 ! HTTP_STATUS_DENIED = 401 ! HTTP_STATUS_PAYMENT_REQ = 402 ! HTTP_STATUS_FORBIDDEN = 403 ! HTTP_STATUS_NOT_FOUND = 404 ! HTTP_STATUS_BAD_METHOD = 405 ! HTTP_STATUS_NONE_ACCEPTABLE = 406 ! HTTP_STATUS_PROXY_AUTH_REQ = 407 ! HTTP_STATUS_REQUEST_TIMEOUT = 408 ! HTTP_STATUS_CONFLICT = 409 ! HTTP_STATUS_GONE = 410 ! HTTP_STATUS_LENGTH_REQUIRED = 411 ! HTTP_STATUS_PRECOND_FAILED = 412 ! HTTP_STATUS_REQUEST_TOO_LARGE = 413 ! HTTP_STATUS_URI_TOO_LONG = 414 ! HTTP_STATUS_UNSUPPORTED_MEDIA = 415 ! HTTP_STATUS_RETRY_WITH = 449 ! HTTP_STATUS_SERVER_ERROR = 500 ! HTTP_STATUS_NOT_SUPPORTED = 501 ! HTTP_STATUS_BAD_GATEWAY = 502 ! HTTP_STATUS_SERVICE_UNAVAIL = 503 ! HTTP_STATUS_GATEWAY_TIMEOUT = 504 ! HTTP_STATUS_VERSION_NOT_SUP = 505 ! HTTP_STATUS_FIRST = HTTP_STATUS_CONTINUE ! HTTP_STATUS_LAST = HTTP_STATUS_VERSION_NOT_SUP ! WINHTTP_ADDREQ_INDEX_MASK = 0x0000FFFF ! WINHTTP_ADDREQ_FLAGS_MASK = (-65536) ! WINHTTP_ADDREQ_FLAG_ADD_IF_NEW = 0x10000000 ! WINHTTP_ADDREQ_FLAG_ADD = 0x20000000 ! WINHTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA = 0x40000000 ! WINHTTP_ADDREQ_FLAG_COALESCE_WITH_SEMICOLON = 0x01000000 ! WINHTTP_ADDREQ_FLAG_COALESCE = WINHTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA ! WINHTTP_ADDREQ_FLAG_REPLACE = (-2147483648) ! WINHTTP_IGNORE_REQUEST_TOTAL_LENGTH = 0 ! WINHTTP_ERROR_BASE = 12000 ! ERROR_WINHTTP_OUT_OF_HANDLES = (WINHTTP_ERROR_BASE + 1) ! ERROR_WINHTTP_TIMEOUT = (WINHTTP_ERROR_BASE + 2) ! ERROR_WINHTTP_INTERNAL_ERROR = (WINHTTP_ERROR_BASE + 4) ! ERROR_WINHTTP_INVALID_URL = (WINHTTP_ERROR_BASE + 5) ! ERROR_WINHTTP_UNRECOGNIZED_SCHEME = (WINHTTP_ERROR_BASE + 6) ! ERROR_WINHTTP_NAME_NOT_RESOLVED = (WINHTTP_ERROR_BASE + 7) ! ERROR_WINHTTP_INVALID_OPTION = (WINHTTP_ERROR_BASE + 9) ! ERROR_WINHTTP_OPTION_NOT_SETTABLE = (WINHTTP_ERROR_BASE + 11) ! ERROR_WINHTTP_SHUTDOWN = (WINHTTP_ERROR_BASE + 12) ! ERROR_WINHTTP_LOGIN_FAILURE = (WINHTTP_ERROR_BASE + 15) ! ERROR_WINHTTP_OPERATION_CANCELLED = (WINHTTP_ERROR_BASE + 17) ! ERROR_WINHTTP_INCORRECT_HANDLE_TYPE = (WINHTTP_ERROR_BASE + 18) ! ERROR_WINHTTP_INCORRECT_HANDLE_STATE = (WINHTTP_ERROR_BASE + 19) ! ERROR_WINHTTP_CANNOT_CONNECT = (WINHTTP_ERROR_BASE + 29) ! ERROR_WINHTTP_CONNECTION_ERROR = (WINHTTP_ERROR_BASE + 30) ! ERROR_WINHTTP_RESEND_REQUEST = (WINHTTP_ERROR_BASE + 32) ! ERROR_WINHTTP_CLIENT_AUTH_CERT_NEEDED = (WINHTTP_ERROR_BASE + 44) ! ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN = (WINHTTP_ERROR_BASE + 100) ! ERROR_WINHTTP_CANNOT_CALL_BEFORE_SEND = (WINHTTP_ERROR_BASE + 101) ! ERROR_WINHTTP_CANNOT_CALL_AFTER_SEND = (WINHTTP_ERROR_BASE + 102) ! ERROR_WINHTTP_CANNOT_CALL_AFTER_OPEN = (WINHTTP_ERROR_BASE + 103) ! ERROR_WINHTTP_HEADER_NOT_FOUND = (WINHTTP_ERROR_BASE + 150) ! ERROR_WINHTTP_INVALID_SERVER_RESPONSE = (WINHTTP_ERROR_BASE + 152) ! ERROR_WINHTTP_INVALID_HEADER = (WINHTTP_ERROR_BASE + 153) ! ERROR_WINHTTP_INVALID_QUERY_REQUEST = (WINHTTP_ERROR_BASE + 154) ! ERROR_WINHTTP_HEADER_ALREADY_EXISTS = (WINHTTP_ERROR_BASE + 155) ! ERROR_WINHTTP_REDIRECT_FAILED = (WINHTTP_ERROR_BASE + 156) ! ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR = (WINHTTP_ERROR_BASE + 178) ! ERROR_WINHTTP_BAD_AUTO_PROXY_SCRIPT = (WINHTTP_ERROR_BASE + 166) ! ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT = (WINHTTP_ERROR_BASE + 167) ! ERROR_WINHTTP_NOT_INITIALIZED = (WINHTTP_ERROR_BASE + 172) ! ERROR_WINHTTP_SECURE_FAILURE = (WINHTTP_ERROR_BASE + 175) ! ERROR_WINHTTP_SECURE_CERT_DATE_INVALID = (WINHTTP_ERROR_BASE + 37) ! ERROR_WINHTTP_SECURE_CERT_CN_INVALID = (WINHTTP_ERROR_BASE + 38) ! ERROR_WINHTTP_SECURE_INVALID_CA = (WINHTTP_ERROR_BASE + 45) ! ERROR_WINHTTP_SECURE_CERT_REV_FAILED = (WINHTTP_ERROR_BASE + 57) ! ERROR_WINHTTP_SECURE_CHANNEL_ERROR = (WINHTTP_ERROR_BASE + 157) ! ERROR_WINHTTP_SECURE_INVALID_CERT = (WINHTTP_ERROR_BASE + 169) ! ERROR_WINHTTP_SECURE_CERT_REVOKED = (WINHTTP_ERROR_BASE + 170) ! ERROR_WINHTTP_SECURE_CERT_WRONG_USAGE = (WINHTTP_ERROR_BASE + 179) ! ERROR_WINHTTP_AUTODETECTION_FAILED = (WINHTTP_ERROR_BASE + 180) ! ERROR_WINHTTP_HEADER_COUNT_EXCEEDED = (WINHTTP_ERROR_BASE + 181) ! ERROR_WINHTTP_HEADER_SIZE_OVERFLOW = (WINHTTP_ERROR_BASE + 182) ! ERROR_WINHTTP_CHUNKED_ENCODING_HEADER_SIZE_OVERFLOW = (WINHTTP_ERROR_BASE + 183) ! ERROR_WINHTTP_RESPONSE_DRAIN_OVERFLOW = (WINHTTP_ERROR_BASE + 184) ! ERROR_WINHTTP_CLIENT_CERT_NO_PRIVATE_KEY = (WINHTTP_ERROR_BASE + 185) ! ERROR_WINHTTP_CLIENT_CERT_NO_ACCESS_PRIVATE_KEY = (WINHTTP_ERROR_BASE + 186) ! WINHTTP_ERROR_LAST = (WINHTTP_ERROR_BASE + 186) ! ! WINHTTP_NO_PROXY_NAME = None ! WINHTTP_NO_PROXY_BYPASS = None ! WINHTTP_NO_REFERER = None ! WINHTTP_DEFAULT_ACCEPT_TYPES = None ! WINHTTP_NO_ADDITIONAL_HEADERS = None ! WINHTTP_NO_REQUEST_DATA = None Index: netbios.py =================================================================== RCS file: /cvsroot/pywin32/pywin32/win32/Lib/netbios.py,v retrieving revision 1.4.4.2 retrieving revision 1.4.4.3 diff -C2 -d -r1.4.4.2 -r1.4.4.3 *** netbios.py 27 Nov 2008 11:31:05 -0000 1.4.4.2 --- netbios.py 11 Dec 2008 04:13:35 -0000 1.4.4.3 *************** *** 1,2 **** --- 1,3 ---- + import sys import win32wnet import struct *************** *** 257,260 **** --- 258,268 ---- return NCBStruct(ACTION_HEADER_ITEMS) + def byte_to_int(b): + """Given an element in a binary buffer, return its integer value""" + if sys.version_info >= (3,0): + # a byte is already an int in py3k + return b + return ord(b) # its a char from a string in py2k. + if __name__=='__main__': # code ported from "HOWTO: Get the MAC Address for an Ethernet Adapter" *************** *** 269,279 **** ncb.Reset() ncb.Command = NCBRESET ! ncb.Lana_num = la_enum.lana[i] rc = Netbios(ncb) if rc != 0: raise RuntimeError("Unexpected result %d" % (rc,)) ncb.Reset() ncb.Command = NCBASTAT ! ncb.Lana_num = la_enum.lana[i] ! ncb.Callname = b"* " adapter = ADAPTER_STATUS() ncb.Buffer = adapter --- 277,287 ---- ncb.Reset() ncb.Command = NCBRESET ! ncb.Lana_num = byte_to_int(la_enum.lana[i]) rc = Netbios(ncb) if rc != 0: raise RuntimeError("Unexpected result %d" % (rc,)) ncb.Reset() ncb.Command = NCBASTAT ! ncb.Lana_num = byte_to_int(la_enum.lana[i]) ! ncb.Callname = "* ".encode("ascii") # ensure bytes on py2x and 3k adapter = ADAPTER_STATUS() ncb.Buffer = adapter *************** *** 281,284 **** print("Adapter address:", end=' ') for ch in adapter.adapter_address: ! print("%02x" % (ch,), end=' ') print() --- 289,292 ---- print("Adapter address:", end=' ') for ch in adapter.adapter_address: ! print("%02x" % (byte_to_int(ch),), end=' ') print() |
