NovaBryan/EVE_Dump
Log | Files | 📦 下载最新源码 (.zip) | Refs | README

commit 047d3c93ca6719bd9b5026561d8b7a9f6ed9dcfa
parent a88984564231301d089285303d34fab71cc0619e
Author: n8n-bot <bot@novabryan.com>
Date:   Wed,  7 Oct 2026 13:27:24 +0000

Auto-dump EVE code: 24.01.3586130 (20261007_3586130_code)

Diffstat:
MREADME.md | 1+
Machievement_system/client/repository/message_bus/request_messenger.py | 2+-
Mauraguidance/client/messenger.py | 2+-
Mcampaigns/client/messengers/campaigns_messenger.py | 2+-
Mcampaigns/client/messengers/contribution_methods_messenger.py | 2+-
Mcampaigns/client/mock_data/mock_gateway.py | 2+-
Mcampaigns/client/repository.py | 2+-
Mcarbon/common/script/sys/row.py | 5+++--
Mcommunitytracks/client/messenger/request_messenger.py | 2+-
Mcommunitytracks/client/mock/mock_gateway.py | 2+-
Mcorporation/client/goals/goalMessenger.py | 2+-
Mdailygoals/client/goalMessenger.py | 2+-
Mdailygoals/client/mockMessenger.py | 2+-
Meve/client/script/ui/station/agents/agents.py | 18------------------
Meveagent/data.py | 22+++++++++++++++++++++-
MexpertSystems/client/util.py | 1-
Mfreelanceprojects/client/contributionmethods/itemdelivery/messenger.py | 2+-
Mfreelanceprojects/client/contributionmethods/messenger.py | 2+-
Mfreelanceprojects/client/contributionmethods/mock/mock_gateway.py | 2+-
Mfreelanceprojects/client/messenger.py | 2+-
Mjobboard/client/features/daily_goals/completion_convenience/const.py | 2+-
Mmultiprocessing/pool.pyc | 0
Mplex/client/message_bus/request_messenger.py | 2+-
Msovereignty/client/base_external_messenger.py | 2+-
Msovereignty/fuel/client/external_messenger.py | 2+-
Msovereignty/mercenaryden/client/mocks/request_messenger_mock.py | 2+-
Msovereignty/mercenaryden/client/request_messenger.py | 2+-
Msovereignty/resource/client/messenger.py | 2+-
Msovereignty/skyhook/client/messenger.py | 2+-
Msovereignty/upgrades/client/external_messenger.py | 2+-
Msovereignty/workforce/client/external_messenger.py | 2+-
Mstargate/client/gateLockMessenger.py | 2+-
Mstore/client/payment/purchase/messenger/request_messenger.py | 2+-
Mstore/client/payment/schedule/messenger/request_messenger.py | 2+-
34 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/README.md b/README.md @@ -8,6 +8,7 @@ A timeline of all version captures and synchronizations is documented here: | Update Date | Target Version Tag | Version | Notes | | :--- | :--- | :--- | :--- | +| **2026-10-07** | `eve-24_01_3586130` | 24.01.3586130 | Automated unpack and sync | | **2026-10-06** | `eve-24_01_3579973` | 24.01.3579973 | Automated unpack and sync | | **2026-10-05** | `eve-24_01_3575015` | 24.01.3575015 | Automated unpack and sync | | **2026-10-04** | `eve-24_01_3569502` | 24.01.3569502 | Automated unpack and sync | diff --git a/achievement_system/client/repository/message_bus/request_messenger.py b/achievement_system/client/repository/message_bus/request_messenger.py @@ -1,6 +1,6 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\achievement_system\client\repository\message_bus\request_messenger.py import logging -import httplib +from six.moves import http_client as httplib from achievement_system.client.model.definition.contribution_method.parameter.configuration import ContributionMethodParameterConfiguration from achievement_system.client.model.definition.achievement.identifier import AchievementDefinitionIdentifier from achievement_system.client.model.definition.achievement.milestone.identifier import AchievementMilestoneDefinitionIdentifier diff --git a/auraguidance/client/messenger.py b/auraguidance/client/messenger.py @@ -2,7 +2,7 @@ from auraguidance.client.errors import AuraGuidanceServiceUnavailableError, AuraGuidanceError from auraguidance.client.logger import logger from eveProto.generated.eve_public.ai.assistant.chat.api.requests_pb2 import QueryRequest, QueryResponse -from httplib import OK, responses as httplib_responses +from six.moves.http_client import OK, responses as httplib_responses from localization.client.cerberus_dynamic_formatted_message import CerberusDynamicFormattedMessage from stackless_response_router.exceptions import TimeoutException, UnpackException diff --git a/campaigns/client/messengers/campaigns_messenger.py b/campaigns/client/messengers/campaigns_messenger.py @@ -7,7 +7,7 @@ from eveProto.generated.eve_public.campaign.api.requests_pb2 import GetLimitsReq from eveProto.generated.eve_public.campaign.objective.objective_pb2 import Identifier as ObjectiveIdentifier from eveProto.generated.eve_public.campaign.objective.api.requests_pb2 import GetStatsRequest as ObjectiveGetStatsRequest, GetStatsResponse as ObjectiveGetStatsResponse, CommitRequest, CommitResponse, ResignRequest, ResignResponse, RedeemRewardsRequest, RedeemRewardsResponse from eveProto.generated.eve_public.public_pb2 import Page -from httplib import OK, UNAUTHORIZED, NOT_FOUND, BAD_REQUEST, NOT_MODIFIED, FORBIDDEN +from six.moves.http_client import OK, UNAUTHORIZED, NOT_FOUND, BAD_REQUEST, NOT_MODIFIED, FORBIDDEN from stackless_response_router.exceptions import TimeoutException, UnpackException try: from typing import List, Dict diff --git a/campaigns/client/messengers/contribution_methods_messenger.py b/campaigns/client/messengers/contribution_methods_messenger.py @@ -3,7 +3,7 @@ import logging from campaigns.client.data_model.contribution_method import ContributionMethodDefinition from campaigns.client.errors import ContributionMethodNotFoundError, ContributionMethodBadRequestError, ContributionMethodRequestError from eveProto.generated.eve_public.campaign.contributionmethod.definition.api.requests_pb2 import GetAllRequest, GetAllResponse -from httplib import NOT_FOUND, BAD_REQUEST, OK +from six.moves.http_client import NOT_FOUND, BAD_REQUEST, OK from semantic_version import SemanticVersion from stackless_response_router.exceptions import TimeoutException, UnpackException logger = logging.getLogger('campaigns') diff --git a/campaigns/client/mock_data/mock_gateway.py b/campaigns/client/mock_data/mock_gateway.py @@ -10,7 +10,7 @@ from eveProto.generated.eve_public.campaign.contributionmethod.definition.api.re from eveProto.generated.eve_public.campaign.api.requests_pb2 import GetLimitsRequest, GetLimitsResponse, GetAllRequest, GetAllResponse, GetParticipantStatsResponse, GetParticipantStatsRequest, GetStatsResponse, GetStatsRequest, GetAllUnredeemedRewardsRequest, GetRequest from eveProto.generated.eve_public.campaign.objective.api.requests_pb2 import CommitRequest, ResignRequest, RedeemRewardsRequest, GetStatsRequest as ObjectiveGetStatsRequest, GetStatsResponse as ObjectiveGetStatsResponse from eveProto.generated.eve_public.campaign.objective.objective_pb2 import Identifier as ObjectiveIdentifier -from httplib import OK, NOT_FOUND, INTERNAL_SERVER_ERROR, BAD_REQUEST, FORBIDDEN, UNAUTHORIZED +from six.moves.http_client import OK, NOT_FOUND, INTERNAL_SERVER_ERROR, BAD_REQUEST, FORBIDDEN, UNAUTHORIZED from logging import getLogger from mock import Mock from semantic_version import SemanticVersion diff --git a/campaigns/client/repository.py b/campaigns/client/repository.py @@ -19,7 +19,7 @@ from campaigns.client.messengers.campaigns_messenger import CampaignsMessenger from campaigns.client.messengers.contribution_methods_messenger import CampaignContributionMethodsMessenger from campaigns.client.util import get_viewed_objective_ids from collections import defaultdict -from httplib import NOT_MODIFIED +from six.moves.http_client import NOT_MODIFIED from jobboard.client import ProviderType from jobboard.client.job_board_signals import on_data_primed from locks import RWLock diff --git a/carbon/common/script/sys/row.py b/carbon/common/script/sys/row.py @@ -1,4 +1,5 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\carbon\common\script\sys\row.py +from __future__ import print_function from future.utils import raise_ import sys import types @@ -52,7 +53,7 @@ class Row(object): try: self.line[self.header.index(key)] = value except ValueError: - raise AttributeError, key + raise AttributeError(key) def __repr__(self): header = self.header @@ -175,6 +176,6 @@ class TestRowMarshal(unittest.TestCase): try: new = blue.marshal.Load(m) except Exception as exc: - print 'Could not marshal row: %s' % exc + print('Could not marshal row: %s' % exc) self.assertEqual(row, new) diff --git a/communitytracks/client/messenger/request_messenger.py b/communitytracks/client/messenger/request_messenger.py @@ -1,5 +1,5 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\communitytracks\client\messenger\request_messenger.py -import httplib +from six.moves import http_client as httplib from communitytracks.client.data.instance_attributes import InstanceAttributes from communitytracks.client.mock.mock_gateway import MockCommunityTracksGateway from communitytracks.client.data.instance_identifier import InstanceIdentifier diff --git a/communitytracks/client/mock/mock_gateway.py b/communitytracks/client/mock/mock_gateway.py @@ -1,5 +1,5 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\communitytracks\client\mock\mock_gateway.py -import httplib +from six.moves import http_client as httplib from communitytracks.client.data.definition_identifier import DefinitionIdentifier from communitytracks.client.data.instance_attributes import InstanceAttributes from communitytracks.client.data.instance_identifier import InstanceIdentifier diff --git a/corporation/client/goals/goalMessenger.py b/corporation/client/goals/goalMessenger.py @@ -3,7 +3,7 @@ import datetime import corporation.client.goals.goalMessengerSignals as messenger_signals import datetimeutils import gametime -import httplib +from six.moves import http_client as httplib import logging import uuid from corporation.client.goals.errors import GoalMessengerError, AtGoalCapacity, GoalError, GoalNotFound, BadRequestToReserveAsset, WalletAccessForbidden, InternalErrorReservingAsset, InvalidExpirationTime diff --git a/dailygoals/client/goalMessenger.py b/dailygoals/client/goalMessenger.py @@ -1,5 +1,5 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\dailygoals\client\goalMessenger.py -import httplib +from six.moves import http_client as httplib import logging import uuid import blue diff --git a/dailygoals/client/mockMessenger.py b/dailygoals/client/mockMessenger.py @@ -1,5 +1,5 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\dailygoals\client\mockMessenger.py -import httplib +from six.moves import http_client as httplib import logging import uuid import datetime diff --git a/eve/client/script/ui/station/agents/agents.py b/eve/client/script/ui/station/agents/agents.py @@ -27,7 +27,6 @@ from eve.common.lib import appConst from eve.common.script.net import eveMoniker from eve.common.script.sys.idCheckers import IsStation, IsSolarSystem from eve.common.script.util.eveFormat import FmtISK -from eveagent.data import get_agents_in_space from evedungeons.client.data import GetDungeon from evemissions.client.const import CAREER_PATH_BY_DIVISION from evemissions.client.ui.missiongiver import MissionGiver @@ -36,7 +35,6 @@ from featuremanagement.client.flag import flag_bool from globalConfig import GetNewMissionGiverEnabled from jobboard.client import open_mission from jobboard.client.feature_flag import is_job_board_available, are_missions_in_job_board_available -from npcs.npccorporations import get_corporation_faction_id from omega.client.clone_grade_svc import get_clone_grade_svc from player_messaging import PromptOptions, PromptIcon from player_messaging.client import get_supressed_result, set_suppress_result @@ -93,23 +91,7 @@ class Agents(Service): with self._getAllAgentsLock: if self.allAgents is None: self.fetchingAgents = True - agentsInSpace = get_agents_in_space() agents = sm.RemoteSvc('agentMgr').GetAgents().Clone() - agents.AddField('factionID', None) - agents.AddField('solarsystemID', None) - for agent in agents: - if agent.stationID: - uiSvc = sm.GetService('ui') - stationInfo = uiSvc.GetStationStaticInfo(agent.stationID) - agent.corporationID = agent.corporationID or uiSvc.GetStationOwner(agent.stationID) - agent.solarsystemID = stationInfo.solarSystemID - elif agent.agentID in agentsInSpace: - info = agentsInSpace.get(agent.agentID) - agent.solarsystemID = info.solarSystemID - else: - agent.solarsystemID = None - agent.factionID = get_corporation_faction_id(agent.corporationID) - self.allAgentsByID = agents.Index('agentID') self.allAgentsByStationID = agents.Filter('stationID') self.allAgentsBySolarSystemID = agents.Filter('solarsystemID') diff --git a/eveagent/data.py b/eveagent/data.py @@ -9,6 +9,7 @@ from eve.common.lib.appConst import agentTypeTutorialAgent from eve.common.lib.appConst import factionCONCORDAssembly from eve.common.lib.appConst import factionJoveEmpire from eve.common.lib.appConst import factionSocietyOfConsciousThought +from eve.common.script.sys.idCheckers import IsStation from fsdBuiltData.common.base import BuiltDataLoader from npcs.npccorporations import get_corporation_faction_id try: @@ -59,12 +60,31 @@ def iter_agents(): def get_agent_type_id(character, agent): - faction_id = get_corporation_faction_id(character.corporationID) + faction_id = get_agent_faction_id(character) if agent.agentType in (agentTypeTutorialAgent, agentTypeCONCORDAgent) or agent.agentLevel == 6 or faction_id in (factionCONCORDAssembly, factionJoveEmpire, factionSocietyOfConsciousThought): return agentTypeEventMissionAgent return agent.agentType +def get_agent_faction_id(character): + return get_corporation_faction_id(character.corporationID) + + +def get_agent_solar_system_id(character_id, station): + agent_in_space = get_agent_in_space(character_id) + if agent_in_space: + return agent_in_space.solarSystemID + if station: + return station.solarSystemID + + +def get_agent_station_id(character_id, character, agents_in_space): + if character_id in agents_in_space: + return None + if character.stationID and IsStation(character.stationID): + return character.stationID + + def get_agent_count_by_corporation(agent_type = None): agent_count = defaultdict(int) for _, character, agent in iter_agents(): diff --git a/expertSystems/client/util.py b/expertSystems/client/util.py @@ -1,6 +1,5 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\expertSystems\client\util.py import functools -import urlparse import evetypes from carbon.common.script.sys.serviceManager import ServiceManager from carbonui.uicore import uicore diff --git a/freelanceprojects/client/contributionmethods/itemdelivery/messenger.py b/freelanceprojects/client/contributionmethods/itemdelivery/messenger.py @@ -7,7 +7,7 @@ from freelanceprojects.client.contributionmethods.itemdelivery.delivery import D from freelanceprojects.client.contributionmethods.itemdelivery.errors import ItemMissingError, ProjectInactiveError, QuantityTooHighError, NotCommittedError, InvalidStructureError, InvalidItemTypeError, GenericDeliveryError, StatusRequestError from freelanceprojects.client.contributionmethods.itemdelivery.item_delivery_signals import on_contribution_failed_internal, on_contribution_successful_internal, on_contribution_error from freelanceprojects.common.errors import ServiceUnavailableError -from httplib import OK +from six.moves.http_client import OK from stackless_response_router.exceptions import TimeoutException, UnpackException logger = logging.getLogger('freelance_projects') WAIT_UNTIL_STATUS_CHECK = 5 diff --git a/freelanceprojects/client/contributionmethods/messenger.py b/freelanceprojects/client/contributionmethods/messenger.py @@ -2,7 +2,7 @@ from eveProto.generated.eve_public.freelance.contributionmethod.definition.api.requests_pb2 import GetAllLatestRequest, GetAllLatestResponse, GetAllLatestWithinMajorRequest, GetAllLatestWithinMajorResponse from freelanceprojects.client.contributionmethods.data.definitions import ContributionMethodDefinitions from freelanceprojects.client.contributionmethods.errors import ServiceUnavailable, DefinitionsNotModified, DefinitionsNotFound, GenericError -from httplib import OK, NOT_MODIFIED, NOT_FOUND +from six.moves.http_client import OK, NOT_MODIFIED, NOT_FOUND from logging import getLogger from semantic_version import SemanticVersion from stackless_response_router.exceptions import TimeoutException, UnpackException diff --git a/freelanceprojects/client/contributionmethods/mock/mock_gateway.py b/freelanceprojects/client/contributionmethods/mock/mock_gateway.py @@ -1,7 +1,7 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\freelanceprojects\client\contributionmethods\mock\mock_gateway.py from eveProto.generated.eve_public.freelance.contributionmethod.definition.api.requests_pb2 import GetAllLatestRequest, GetAllLatestWithinMajorRequest from freelanceprojects.client.contributionmethods.mock.data import definitions as mock_definitions -from httplib import OK, NOT_MODIFIED, NOT_FOUND, INTERNAL_SERVER_ERROR +from six.moves.http_client import OK, NOT_MODIFIED, NOT_FOUND, INTERNAL_SERVER_ERROR from logging import getLogger from mock import Mock logger = getLogger('freelance_projects') diff --git a/freelanceprojects/client/messenger.py b/freelanceprojects/client/messenger.py @@ -13,7 +13,7 @@ from freelanceprojects.client.data.project_limits import CreationLimits, CommitL from freelanceprojects.client.errors import MaxActiveProjectsPerSystemReachedError, MaxActiveProjectsPerCorpReachedError, InvalidBroadcastingLocationError, MissingRoleError, OutdatedMethodError, OutdatedProjectCostError, GenericProjectUnauthorizedError, GenericProjectForbiddenError, ProjectStateError, ParticipantStateError, MaxCommittedParticipantsPerProjectError, MaxProjectsCommittedPerParticipantError, InvalidCharacterAgeError, CannotManageACLError from freelanceprojects.client.payload_parser import parse_project_details, parse_participants, parse_list_of_projects, parse_managed_project from freelanceprojects.common.errors import ServiceUnavailableError, GenericProjectError, GenericProjectInternalServerError, GenericProjectNotFoundError, GenericProjectBadRequestError -from httplib import OK, BAD_REQUEST, UNAUTHORIZED, FORBIDDEN, NOT_FOUND, INTERNAL_SERVER_ERROR, responses as httplib_responses +from six.moves.http_client import OK, BAD_REQUEST, UNAUTHORIZED, FORBIDDEN, NOT_FOUND, INTERNAL_SERVER_ERROR, responses as httplib_responses from stackless_response_router.exceptions import TimeoutException, UnpackException logger = logging.getLogger('freelance_projects') PAGE_SIZE = 25 diff --git a/jobboard/client/features/daily_goals/completion_convenience/const.py b/jobboard/client/features/daily_goals/completion_convenience/const.py @@ -1,6 +1,6 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\jobboard\client\features\daily_goals\completion_convenience\const.py from eve.client.script.ui import eveColor -from httplib import FORBIDDEN, INTERNAL_SERVER_ERROR +from six.moves.http_client import FORBIDDEN, INTERNAL_SERVER_ERROR TEXT_COLOR_EVERMARK_GREEN = eveColor.EVERMARK_GREEN ERROR_MESSAGES = {FORBIDDEN: 'UI/DailyGoals/CompletionConvenienceErrorMessage', INTERNAL_SERVER_ERROR: 'UI/DailyGoals/CompletionConvenienceButtonErrorRefundIncoming'} diff --git a/multiprocessing/pool.pyc b/multiprocessing/pool.pyc Binary files differ. diff --git a/plex/client/message_bus/request_messenger.py b/plex/client/message_bus/request_messenger.py @@ -1,6 +1,6 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\plex\client\message_bus\request_messenger.py import logging -import httplib +from six.moves import http_client as httplib from eveProto.generated.eve_public.plex.vault.api.requests_pb2 import BalanceRequest, BalanceResponse from eveProto.generated.eve_public.plex.vault.transaction.api.requests_pb2 import GetAllLoggedForUserRequest, GetAllLoggedForUserResponse, GetLogRequest, GetLogResponse, GetStatisticsRequest, GetStatisticsResponse from plex.client.api.errors import ServiceUnavailableError, GenericNotFoundError, GenericInternalServerError, GenericError diff --git a/sovereignty/client/base_external_messenger.py b/sovereignty/client/base_external_messenger.py @@ -1,5 +1,5 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\sovereignty\client\base_external_messenger.py -import httplib +from six.moves import http_client as httplib from publicGateway.grpc.exceptions import GenericException DEFAULT_TIMEOUT_SECONDS = 10 diff --git a/sovereignty/fuel/client/external_messenger.py b/sovereignty/fuel/client/external_messenger.py @@ -1,6 +1,6 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\sovereignty\fuel\client\external_messenger.py from __future__ import print_function -import httplib +from six.moves import http_client as httplib from eveProto import timestamp_to_blue from eveProto.generated.eve_public.sovereignty.hub.fuel.api import requests_pb2 from eveProto.generated.eve_public.sovereignty.hub.hub_pb2 import Identifier as HubIdentifier diff --git a/sovereignty/mercenaryden/client/mocks/request_messenger_mock.py b/sovereignty/mercenaryden/client/mocks/request_messenger_mock.py @@ -4,7 +4,7 @@ import datetime from collections import namedtuple from eveProto.generated.eve_public.sovereignty.mercenaryden.api.requests_pb2 import GetAsOwnerRequest from eveProto.generated.eve_public.sovereignty.mercenaryden.mercenaryden_pb2 import Identifier as MercenaryDenIdentifier -from httplib import OK, NOT_FOUND +from six.moves.http_client import OK, NOT_FOUND from logging import getLogger from sovereignty.mercenaryden.client.mocks.data import create_mercenary_den_mock from sovereignty.mercenaryden.client.data.activity import MercenaryDenActivity diff --git a/sovereignty/mercenaryden/client/request_messenger.py b/sovereignty/mercenaryden/client/request_messenger.py @@ -1,7 +1,7 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\sovereignty\mercenaryden\client\request_messenger.py from eveProto.generated.eve_public.sovereignty.mercenaryden.api.requests_pb2 import GetAsOwnerRequest, GetAsOwnerResponse, GetAllOwnedRequest, GetAllOwnedResponse, GetMaximumForCharacterRequest, GetMaximumForCharacterResponse from eveProto.generated.eve_public.sovereignty.mercenaryden.activity.api.requests_pb2 import GetAllRequest, GetAllResponse, GetForMercenaryDenRequest, GetForMercenaryDenResponse, StartRequest, StartResponse, GetCapacityRequest, GetCapacityResponse -from httplib import OK, NOT_FOUND, CONFLICT, FORBIDDEN +from six.moves.http_client import OK, NOT_FOUND, CONFLICT, FORBIDDEN from logging import getLogger from sovereignty.mercenaryden.client.data.activity import MercenaryDenActivity from sovereignty.mercenaryden.client.data.mercenary_den import MercenaryDenInfo diff --git a/sovereignty/resource/client/messenger.py b/sovereignty/resource/client/messenger.py @@ -1,5 +1,5 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\sovereignty\resource\client\messenger.py -import httplib +from six.moves import http_client as httplib import eveProto.generated.eve_public.sovereignty.resource.planet.api.requests_pb2 as SovResourcePlanetAPI import eveProto.generated.eve_public.sovereignty.resource.star.api.requests_pb2 as SovResourceStarAPI import eveProto.generated.eve_public.sovereignty.hub.api.requests_pb2 as HubAPI diff --git a/sovereignty/skyhook/client/messenger.py b/sovereignty/skyhook/client/messenger.py @@ -1,6 +1,6 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\sovereignty\skyhook\client\messenger.py import datetime -import httplib +from six.moves import http_client as httplib import eveProto.generated.eve_public.sovereignty.skyhook.api.requests_pb2 as SkyhookAPI import eveProto.generated.eve_public.sovereignty.skyhook.api.admin.admin_pb2 as SkyhookAdminAPI from eveProto import blue_to_timestamp diff --git a/sovereignty/upgrades/client/external_messenger.py b/sovereignty/upgrades/client/external_messenger.py @@ -1,7 +1,7 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\sovereignty\upgrades\client\external_messenger.py from __future__ import print_function import gametime -import httplib +from six.moves import http_client as httplib import sovereignty.upgrades.client.errors as errors from eveProto import timestamp_to_blue from eveProto.generated.eve_public.inventory.generic_item_pb2 import Identifier as ItemID diff --git a/sovereignty/workforce/client/external_messenger.py b/sovereignty/workforce/client/external_messenger.py @@ -1,7 +1,7 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\sovereignty\workforce\client\external_messenger.py from publicGateway.grpc.exceptions import GenericException from sovereignty.client.base_external_messenger import BaseClientExternalMessenger -import httplib +from six.moves import http_client as httplib from eveProto.generated.eve_public.sovereignty.hub.workforce.api import requests_pb2 from eveProto.generated.eve_public.sovereignty.hub.hub_pb2 import Identifier as HubIdentifier from eveProto.generated.eve_public.sovereignty.hub.workforce.workforce_pb2 import Configuration, ImportConfiguration, ExportConfiguration diff --git a/stargate/client/gateLockMessenger.py b/stargate/client/gateLockMessenger.py @@ -1,6 +1,6 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\stargate\client\gateLockMessenger.py from datetime import datetime -import httplib +from six.moves import http_client as httplib import logging from eveProto.generated.eve_public.stargate.lock.api.notices_pb2 import RestrictedSystemsNotice, ActivatedNotice, DeactivatedNotice from eveProto.generated.eve_public.stargate.lock.api.requests_pb2 import GetRequest, GetResponse, GetRestrictedSystemsRequest, GetRestrictedSystemsResponse diff --git a/store/client/payment/purchase/messenger/request_messenger.py b/store/client/payment/purchase/messenger/request_messenger.py @@ -1,6 +1,6 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\store\client\payment\purchase\messenger\request_messenger.py import logging -import httplib +from six.moves import http_client as httplib from ipaddress.proto import to_eve_public from publicGateway.grpc.exceptions import GenericException from stackless_response_router.exceptions import TimeoutException diff --git a/store/client/payment/schedule/messenger/request_messenger.py b/store/client/payment/schedule/messenger/request_messenger.py @@ -1,6 +1,6 @@ #Embedded file name: C:\BuildAgent\work\20d73f1b24eed06e\eve\release\V24.01\packages\store\client\payment\schedule\messenger\request_messenger.py import logging -from httplib import NOT_FOUND +from six.moves.http_client import NOT_FOUND from publicGateway.grpc.exceptions import GenericException from stackless_response_router.exceptions import TimeoutException from store.client.const import LOG_ENTRY_NAME