Skip to content

[FIX] Add-ons: Problems with datetime parsing #2196

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.

Sign up for GitHub

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

Merged
astaric merged 2 commits into from
Apr 7, 2017
Merged

[FIX] Add-ons: Problems with datetime parsing #2196

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cfa8cc
[FIX] Add-ons: Problems with datetime parsing
jerneju Apr 6, 2017
e3b8ef6
addons: lint
jerneju Apr 6, 2017
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
49 changes: 28 additions & 21 deletions Orange/canvas/application/addons.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from collections import namedtuple, deque
from xml.sax.saxutils import escape
from distutils import version
from email.parser import HeaderParser
import urllib.request
import xmlrpc.client

Expand Down Expand Up @@ -42,7 +41,6 @@
)
from AnyQt.QtCore import pyqtSignal as Signal, pyqtSlot as Slot

from ..config import ADDON_KEYWORD
from ..gui.utils import message_warning, message_information, \
message_critical as message_error, \
OSX_NSURL_toLocalFile
Expand Down Expand Up @@ -74,7 +72,7 @@
"size",
"python_version",
"package_type"
]
]
)

Available = namedtuple(
Expand Down Expand Up @@ -405,9 +403,9 @@ def _detailed_text(self, item):
writer_name="html",
settings_overrides={
"output-encoding": "utf-8",
# "embed-stylesheet": False,
# "stylesheet": [],
# "stylesheet_path": []
# "embed-stylesheet": False,
# "stylesheet": [],
# "stylesheet_path": []
}
).decode("utf-8")

Expand Down Expand Up @@ -573,7 +571,7 @@ def closeEvent(self, event):
def dragEnterEvent(self, event):
urls = event.mimeData().urls()
if any((OSX_NSURL_toLocalFile(url) or url.toLocalFile())
.endswith(self.ADDON_EXTENSIONS) for url in urls):
.endswith(self.ADDON_EXTENSIONS) for url in urls):
event.acceptProposedAction()

def dropEvent(self, event):
Expand Down Expand Up @@ -682,26 +680,19 @@ def list_pypi_addons():

name = addon["name"]
multicall.release_data(name, version_)
multicall.release_urls(name, version_)

results = list(multicall())
release_data = results[::2]
release_urls = results[1::2]
packages = []

for release, urls in zip(release_data, release_urls):
if release and urls:
for release in results:
if release:
# ignore releases without actual source/wheel/egg files,
# or with empty metadata (deleted from PyPi?).
urls = [ReleaseUrl(url["filename"], url["url"],
url["size"], url["python_version"],
url["packagetype"])
for url in urls]
packages.append(
Installable(release["name"], release["version"],
release["summary"], release["description"],
release["package_url"],
urls)
release["package_url"])
)
return packages

Expand Down Expand Up @@ -777,7 +768,11 @@ def fmt_cmd(cmd):
cmd = (["-m", "pip", "install"] +
(["--user"] if self.__user_install else []) +
[inst_name])
process = python_process(cmd, bufsize=-1, universal_newlines=True, env=_env_with_proxies())
process = python_process(cmd,
bufsize=-1,
universal_newlines=True,
env=_env_with_proxies()
)
retcode, output = self.__subprocessrun(process)

if retcode != 0:
Expand All @@ -792,7 +787,11 @@ def fmt_cmd(cmd):
cmd = (["-m", "pip", "install", "--upgrade", "--no-deps"] +
(["--user"] if self.__user_install else []) +
[inst_name])
process = python_process(cmd, bufsize=-1, universal_newlines=True, env=_env_with_proxies())
process = python_process(cmd,
bufsize=-1,
universal_newlines=True,
env=_env_with_proxies()
)
retcode, output = self.__subprocessrun(process)

if retcode != 0:
Expand All @@ -803,7 +802,11 @@ def fmt_cmd(cmd):
cmd = (["-m", "pip", "install"] +
(["--user"] if self.__user_install else []) +
[inst_name])
process = python_process(cmd, bufsize=-1, universal_newlines=True, env=_env_with_proxies())
process = python_process(cmd,
bufsize=-1,
universal_newlines=True,
env=_env_with_proxies()
)
retcode, output = self.__subprocessrun(process)

if retcode != 0:
Expand All @@ -815,7 +818,11 @@ def fmt_cmd(cmd):
self.setStatusMessage("Uninstalling {}".format(dist.project_name))

cmd = ["-m", "pip", "uninstall", "--yes", dist.project_name]
process = python_process(cmd, bufsize=-1, universal_newlines=True, env=_env_with_proxies())
process = python_process(cmd,
bufsize=-1,
universal_newlines=True,
env=_env_with_proxies()
)
retcode, output = self.__subprocessrun(process)

if self.__user_install:
Expand Down