diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/Vpc/Basic/Download/Component.php b/Vpc/Basic/Download/Component.php
index <HASH>..<HASH> 100644
--- a/Vpc/Basic/Download/Component.php
+++ b/Vpc/Basic/Download/Component.php
@@ -71,5 +71,7 @@ class Vpc_Basic_Download_Component extends Vpc_Abstract_Composite_Component
$field = Zend_Search_Lucene_Field::UnStored($fieldName, $this->_getRow()->infotext, 'utf-8');
$doc->addField($field);
+
+ return $doc;
}
}
|
fix fulltext indexing for Download component
|
diff --git a/onnx_mxnet/import_onnx.py b/onnx_mxnet/import_onnx.py
index <HASH>..<HASH> 100644
--- a/onnx_mxnet/import_onnx.py
+++ b/onnx_mxnet/import_onnx.py
@@ -215,13 +215,13 @@ class GraphProto(object):
MXNet doesnt have a squeeze operator.
Using "split" to perform similar operation.
"split" can be slower compared to "reshape".
- Remove this implementation once mxnet adds the support.
+ This can have performance impact.
+ TODO: Remove this implementation once mxnet adds the support.
"""
axes = new_attr.get('axis')
op = mx.sym.split(inputs[0], axis=axes[0], num_outputs=1, squeeze_axis=1)
- if len(axes) > 1:
- for i in axes[1:]:
- op = mx.sym.split(op, axis=i-1, num_outputs=1, squeeze_axis=1)
+ for i in axes[1:]:
+ op = mx.sym.split(op, axis=i-1, num_outputs=1, squeeze_axis=1)
return op
def _fix_gemm(self, op_name, inputs, old_attr):
|
Nits: Removed redundant code
Added few comments
|
diff --git a/php/commands/network.php b/php/commands/network.php
index <HASH>..<HASH> 100644
--- a/php/commands/network.php
+++ b/php/commands/network.php
@@ -3,14 +3,6 @@
/**
* Manage network custom fields.
*
- * ## OPTIONS
- *
- * <id>
- * : The network id (usually 1).
- *
- * --format=json
- * : Encode/decode values as JSON.
- *
* ## EXAMPLES
*
* # Get a list of super-admins
diff --git a/php/commands/post.php b/php/commands/post.php
index <HASH>..<HASH> 100644
--- a/php/commands/post.php
+++ b/php/commands/post.php
@@ -593,11 +593,6 @@ class Post_Command extends \WP_CLI\CommandWithDBObject {
/**
* Manage post custom fields.
*
- * ## OPTIONS
- *
- * [--format=json]
- * : Encode/decode values as JSON.
- *
* ## EXAMPLES
*
* # Set post meta
diff --git a/php/commands/term.php b/php/commands/term.php
index <HASH>..<HASH> 100644
--- a/php/commands/term.php
+++ b/php/commands/term.php
@@ -566,11 +566,6 @@ class Term_Command extends WP_CLI_Command {
/**
* Manage term custom fields.
*
- * ## OPTIONS
- *
- * --format=json
- * : Encode/decode values as JSON.
- *
* ## EXAMPLES
*
* # Set term meta
|
Remove ## OPTIONS from meta classes
These won't be rendered in the appropriate place.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
from distutils.core import setup
setup(name='messagegroups',
- version='0.1.1',
+ version='0.3',
description='Render grouped messages with the Django messaging framework',
author='Factor AG',
author_email='webmaster@factor.ch',
|
Updated setup.py to <I>
|
diff --git a/src/Widget/IconPicker.php b/src/Widget/IconPicker.php
index <HASH>..<HASH> 100644
--- a/src/Widget/IconPicker.php
+++ b/src/Widget/IconPicker.php
@@ -41,6 +41,15 @@ class IconPicker extends \Widget
$fontPath = $GLOBALS['TL_DCA'][$this->strTable]['fields'][$this->strField]['eval']['iconFont'];
$fontPathNoSuffix = implode('.', explode('.', $fontPath, -1));
+ // Strip web directory prefix
+ if ($webDir = \System::getContainer()->getParameter('contao.web_dir')) {
+ $webDir = \StringUtil::stripRootDir($webDir);
+ }
+ else {
+ $webDir = 'web';
+ }
+ $fontPathNoSuffix = preg_replace('(^'.preg_quote($webDir).'/)', '', $fontPathNoSuffix);
+
if (!file_exists(TL_ROOT . '/' . $fontPath)) {
return '<p class="tl_gerror"><strong>'
. sprintf($GLOBALS['TL_LANG']['rocksolid_icon_picker']['font_not_found'], $fontPath)
|
Fixed font paths starting with “web/” (#6)
|
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index <HASH>..<HASH> 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -7067,5 +7067,19 @@ function is_newnav($navigation) {
}
}
+/**
+ * Checks whether the given variable name is defined as a variable within the given object.
+ * @note This will NOT work with stdClass objects, which have no class variables.
+ * @param string $var The variable name
+ * @param object $object The object to check
+ * @return boolean
+ */
+function in_object_vars($var, $object)
+{
+ $class_vars = get_class_vars(get_class($object));
+ $class_vars = array_keys($class_vars);
+ return in_array($var, $class_vars);
+}
+
// vim:autoindent:expandtab:shiftwidth=4:tabstop=4:tw=140:
?>
|
MDL-<I> Added a function that checks an object for the definition of a given variable. Similar to in_array().
|
diff --git a/runtime/classes/propel/adapter/DBOracle.php b/runtime/classes/propel/adapter/DBOracle.php
index <HASH>..<HASH> 100644
--- a/runtime/classes/propel/adapter/DBOracle.php
+++ b/runtime/classes/propel/adapter/DBOracle.php
@@ -134,12 +134,10 @@ class DBOracle extends DBAdapter {
return $row[0];
}
- /* someone please confirm this is valid
public function random($seed=NULL)
{
return 'dbms_random.value';
}
- */
}
|
Ticket #<I> - Closes ticket, method already existed, was requiring someone confirm it worked first.
|
diff --git a/packages/bonde-webpage/src/lib/ux/tell-a-friend-base/tell-a-friend.js b/packages/bonde-webpage/src/lib/ux/tell-a-friend-base/tell-a-friend.js
index <HASH>..<HASH> 100644
--- a/packages/bonde-webpage/src/lib/ux/tell-a-friend-base/tell-a-friend.js
+++ b/packages/bonde-webpage/src/lib/ux/tell-a-friend-base/tell-a-friend.js
@@ -19,7 +19,7 @@ const TellAFriend = ({
widget
}) => {
const settings = widget.settings || {}
-
+ console.log(widget)
return (
<div className='center p3 bg-white darkengray rounded'>
<div className='m0 h3 bold'>{message}</div>
@@ -28,7 +28,9 @@ const TellAFriend = ({
</div>
<p>
<FormattedMessage
- id='share.components--tell-a-friend.text'
+ id={widget.settings.finish_message_type === 'donation-recurrent'
+ ? 'widgets.components--donation.finish-post-donation-messages.tell-a-friend.text'
+ : 'share.components--tell-a-friend.text'}
defaultMessage='Agora, compartilhe com seus amigos!'
/>
</p>
|
feat(webpage): refactor tellAFriend share message
|
diff --git a/py/selenium/webdriver/chrome/service.py b/py/selenium/webdriver/chrome/service.py
index <HASH>..<HASH> 100644
--- a/py/selenium/webdriver/chrome/service.py
+++ b/py/selenium/webdriver/chrome/service.py
@@ -91,8 +91,8 @@ class Service(object):
#Tell the Server to properly die in case
try:
if self.process:
- os.kill(self.process.pid, signal.SIGTERM)
- os.wait()
+ self.process.kill()
+ self.process.wait()
except AttributeError:
# kill may not be available under windows environment
pass
|
DavidBurns correcting shutdown code for ChromeDriver
r<I>
|
diff --git a/src/Composer/ExtensionLoader.php b/src/Composer/ExtensionLoader.php
index <HASH>..<HASH> 100644
--- a/src/Composer/ExtensionLoader.php
+++ b/src/Composer/ExtensionLoader.php
@@ -18,7 +18,7 @@ class ExtensionLoader
/** @var ResolvedExtension[] */
protected $extensions = [];
/** @var string[] */
- protected $map;
+ protected $map = [];
/** @var FilesystemInterface */
private $filesystem;
@@ -102,6 +102,16 @@ class ExtensionLoader
}
/**
+ * Return the in-use extension name map.
+ *
+ * @return string[]
+ */
+ public function getMap()
+ {
+ return $this->map;
+ }
+
+ /**
* Resolve a Composer or PHP extension name to the stored key.
*
* @param $name
|
Getter for the in-use extension name map
|
diff --git a/ibis/backends/pyspark/tests/conftest.py b/ibis/backends/pyspark/tests/conftest.py
index <HASH>..<HASH> 100644
--- a/ibis/backends/pyspark/tests/conftest.py
+++ b/ibis/backends/pyspark/tests/conftest.py
@@ -198,9 +198,8 @@ class TestConf(BackendTest, RoundAwayFromZero):
@pytest.fixture(scope='session')
-def client():
- session = SparkSession.builder.getOrCreate()
- client = ibis.backends.pyspark.Backend().connect(session)
+def client(data_directory):
+ client = get_pyspark_testing_client(data_directory)
df = client._session.range(0, 10)
df = df.withColumn("str_col", F.lit('value'))
|
BUG: Fix pyspark client that was being used to test without data (#<I>)
|
diff --git a/pkg/buildbot_pkg.py b/pkg/buildbot_pkg.py
index <HASH>..<HASH> 100644
--- a/pkg/buildbot_pkg.py
+++ b/pkg/buildbot_pkg.py
@@ -60,10 +60,10 @@ def getVersion(init_file):
v = VERSION_MATCH.search(out)
if v:
version = v.group(1)
- return version
+ return version
except OSError:
pass
- return "latest"
+ return "999.0-version-not-found"
# JS build strategy:
|
buildbot_pkg: return valid version instead of latest
Yet we return a big number to make sure this is not confused with a real version
There are some use cases uncovered by the current method:
If a developer clones the source tree without fetching the tags, git describe
will not find the latest tag.
This would be incorrect to prevent installation in those cases.
|
diff --git a/tests/test_raises.py b/tests/test_raises.py
index <HASH>..<HASH> 100644
--- a/tests/test_raises.py
+++ b/tests/test_raises.py
@@ -119,13 +119,13 @@ def test_pytest_mark_raises_parametrize(testdir):
raise error
""",
[
- '*::test_mark_raises*None* PASSED',
+ '*::test_mark_raises*None0* PASSED',
'*::test_mark_raises*error1* PASSED',
'*::test_mark_raises*error2* PASSED',
'*::test_mark_raises*error3* PASSED',
'*::test_mark_raises*error4* FAILED',
'*::test_mark_raises*error5* FAILED',
- '*::test_mark_raises*6None* FAILED',
+ '*::test_mark_raises*None1* FAILED',
],
1
)
|
Fix test which broke with upgrade to pytest <I>
Unfortunately this test is pretty brittle. For now, hopefully fixing
the pytest version will keep it consistent.
|
diff --git a/classes/BearCMS/Internal/Cookies.php b/classes/BearCMS/Internal/Cookies.php
index <HASH>..<HASH> 100644
--- a/classes/BearCMS/Internal/Cookies.php
+++ b/classes/BearCMS/Internal/Cookies.php
@@ -131,7 +131,7 @@ class Cookies
$requestUrlParts = parse_url($app->request->base);
$serverUrlParts = parse_url(Config::$serverUrl);
$cookieMatches = [];
- preg_match_all('/Set-Cookie:(.*)/u', $headers, $cookieMatches);
+ preg_match_all('/Set-Cookie:(.*)/ui', $headers, $cookieMatches);
foreach ($cookieMatches[1] as $cookieMatch) {
$cookieMatchData = explode(';', $cookieMatch);
$cookieData = array('name' => '', 'value' => '', 'expire' => '', 'path' => '', 'domain' => '', 'secure' => false, 'httponly' => false);
|
Improved server cookies parsing.
|
diff --git a/activeweb/src/main/java/org/javalite/activeweb/Configuration.java b/activeweb/src/main/java/org/javalite/activeweb/Configuration.java
index <HASH>..<HASH> 100644
--- a/activeweb/src/main/java/org/javalite/activeweb/Configuration.java
+++ b/activeweb/src/main/java/org/javalite/activeweb/Configuration.java
@@ -178,7 +178,7 @@ public class Configuration {
String className = get(Params.freeMarkerConfig.toString());
return freeMarkerConfig = (AbstractFreeMarkerConfig)Class.forName(className).newInstance();
}catch(Exception e){
- LOGGER.warn("Failed to find implementation of '" + AbstractFreeMarkerConfig.class + "', proceeding without custom configuration of FreeMarker");
+ LOGGER.debug("Failed to find implementation of '" + AbstractFreeMarkerConfig.class + "', proceeding without custom configuration of FreeMarker");
return null;
}
}
|
#<I> change warning log to debug
|
diff --git a/stanza/models/common/doc.py b/stanza/models/common/doc.py
index <HASH>..<HASH> 100644
--- a/stanza/models/common/doc.py
+++ b/stanza/models/common/doc.py
@@ -309,13 +309,13 @@ class Document(StanzaObject):
def __repr__(self):
return json.dumps(self.to_dict(), indent=2, ensure_ascii=False)
- def to_serialized_string(self):
+ def to_serialized(self):
""" Dumps the whole document including text to a byte array containing a list of list of dictionaries for each token in each sentence in the doc.
"""
return pickle.dumps((self.text, self.to_dict()))
@classmethod
- def from_serialized_string(cls, serialized_string):
+ def from_serialized(cls, serialized_string):
""" Create and initialize a new document from a serialized string generated by Document.to_serialized_string():
"""
try:
@@ -639,7 +639,7 @@ class Token(StanzaObject):
ret.append(token_dict)
for word in self.words:
word_dict = word.to_dict()
- if NER in fields and len(self.id) == 1: # propagate NER label to Word if it is a single-word token
+ if len(self.id) == 1 and NER in fields and getattr(self, NER) is not None: # propagate NER label to Word if it is a single-word token
word_dict[NER] = getattr(self, NER)
ret.append(word_dict)
return ret
|
rename function & fix ner tag is none bug
|
diff --git a/components/Hint/Hint.js b/components/Hint/Hint.js
index <HASH>..<HASH> 100644
--- a/components/Hint/Hint.js
+++ b/components/Hint/Hint.js
@@ -125,12 +125,12 @@ export default class Hint extends React.Component<Props, State> {
}
_renderContent() {
- const { pos } = this.props;
+ const { pos, maxWidth } = this.props;
const className = classNames({
[styles.root]: true,
[styles.rootCenter]: pos === 'top' || pos === 'bottom'
});
- return <div className={className}>{this.props.text}</div>;
+ return <div className={className} style={{ maxWidth }}>{this.props.text}</div>;
}
_ref = (el: ?HTMLElement) => {
|
Make maxWidth prop work again (#<I>)
|
diff --git a/spec/scheduler_spec.rb b/spec/scheduler_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/scheduler_spec.rb
+++ b/spec/scheduler_spec.rb
@@ -156,6 +156,35 @@ describe SCHEDULER_CLASS do
end
end
end
+
+ context 'trigger threads' do
+
+ before(:each) do
+ @s = start_scheduler
+ end
+ after(:each) do
+ stop_scheduler(@s)
+ end
+
+ describe '#trigger_threads' do
+
+ it 'returns an empty list when no jobs are running' do
+
+ @s.trigger_threads.should == []
+ end
+
+ it 'returns a list of the threads of the running jobs' do
+
+ @s.in '1s' do
+ sleep 10
+ end
+
+ sleep 1.5
+
+ @s.trigger_threads.collect { |e| e.class }.should == [ Thread ]
+ end
+ end
+ end
end
describe 'Rufus::Scheduler#start_new' do
|
Scheduler#trigger_threads specs
|
diff --git a/filesystems/native.py b/filesystems/native.py
index <HASH>..<HASH> 100644
--- a/filesystems/native.py
+++ b/filesystems/native.py
@@ -22,7 +22,7 @@ def _create_file(fs, path):
raise exceptions.SymbolicLoop(path.parent())
raise
- return io.open(fd, "w+b")
+ return io.open(fd, "w+")
def _open_file(fs, path, mode):
diff --git a/filesystems/tests/common.py b/filesystems/tests/common.py
index <HASH>..<HASH> 100644
--- a/filesystems/tests/common.py
+++ b/filesystems/tests/common.py
@@ -106,7 +106,7 @@ class TestFS(object):
self.addCleanup(fs.remove, tempdir)
with fs.create(tempdir.descendant("unittesting")) as f:
- f.write(b"some things!")
+ f.write("some things!")
with fs.open(tempdir.descendant("unittesting")) as g:
self.assertEqual(g.read(), "some things!")
@@ -452,7 +452,7 @@ class TestFS(object):
child = to.descendant("child")
with fs.create(child) as f:
- f.write(b"some things over here!")
+ f.write("some things over here!")
self.assertEqual(fs.contents_of(child), "some things over here!")
|
Make create also return file objects expecting native strings...
Fixes the tests on Py3.
|
diff --git a/src/DI/ConsoleExtension.php b/src/DI/ConsoleExtension.php
index <HASH>..<HASH> 100644
--- a/src/DI/ConsoleExtension.php
+++ b/src/DI/ConsoleExtension.php
@@ -46,7 +46,7 @@ class ConsoleExtension extends CompilerExtension
return Expect::structure([
'url' => Expect::string(),
'name' => Expect::string(),
- 'version' => Expect::string(),
+ 'version' => Expect::anyOf(Expect::string(), Expect::int(), Expect::float()),
'catchExceptions' => Expect::bool(),
'autoExit' => Expect::bool(),
'helperSet' => Expect::string(),
@@ -76,7 +76,7 @@ class ConsoleExtension extends CompilerExtension
}
if ($config->version !== null) {
- $applicationDef->addSetup('setVersion', [$config->version]);
+ $applicationDef->addSetup('setVersion', [(string) $config->version]);
}
if ($config->catchExceptions !== null) {
|
ConsoleExtension: allow console version to be numeric
|
diff --git a/lib/sudoku_solver/solver.rb b/lib/sudoku_solver/solver.rb
index <HASH>..<HASH> 100644
--- a/lib/sudoku_solver/solver.rb
+++ b/lib/sudoku_solver/solver.rb
@@ -41,18 +41,21 @@ module SudokuSolver
end
def restrict(cell)
+ taken = neighbours_values(cell).reject { |r| r.length > 1 }.flatten
+ remaining = (cell.content - taken).sort
+ (cell.content == remaining) || ! (cell.content = remaining)
+ end
+
+ def neighbours_values(cell)
grid = cell.map
sx = cell.x - cell.x % @dimension
sy = cell.y - cell.y % @dimension
- neighbouring_values = [
- grid[@size, cell.y],
- grid[cell.x, @size],
- grid[sx..(sx + @dimension - 1), sy..(sy + @dimension - 1)] ].
+ neighbours_values = [
+ cell.map[@size, cell.y],
+ cell.map[cell.x, @size],
+ cell.map[sx..(sx + @dimension - 1), sy..(sy + @dimension - 1)] ].
inject([]) { |r, z| r + z.collect { |d|
(d == cell) ? nil : d.content } }.compact.uniq
- taken = neighbouring_values.reject { |r| r.length > 1 }.flatten
- remaining = (cell.content - taken).sort
- (cell.content == remaining) || ! (cell.content = remaining)
end
end
end
|
A bit of refactoring.
|
diff --git a/lib/ooor/naming.rb b/lib/ooor/naming.rb
index <HASH>..<HASH> 100644
--- a/lib/ooor/naming.rb
+++ b/lib/ooor/naming.rb
@@ -10,7 +10,7 @@ module Ooor
namespace = self.parents.detect do |n|
n.respond_to?(:use_relative_model_naming?) && n.use_relative_model_naming?
end
- ActiveModel::Name.new(self, namespace, self.description).tap do |r|
+ ActiveModel::Name.new(self, namespace, self.description || self.openerp_model).tap do |r|
def r.param_key
@klass.openerp_model.gsub('.', '_')
end
|
fallback for mode names for models loaded on the fly
|
diff --git a/tests/test_build_ext.py b/tests/test_build_ext.py
index <HASH>..<HASH> 100644
--- a/tests/test_build_ext.py
+++ b/tests/test_build_ext.py
@@ -77,8 +77,9 @@ class BuildExtTestCase(support.TempdirManager,
self.assertEqual(xx.foo(2, 5), 7)
self.assertEqual(xx.foo(13,15), 28)
self.assertEqual(xx.new().demo(), None)
- doc = 'This is a template module just for instruction.'
- self.assertEqual(xx.__doc__, doc)
+ if test_support.HAVE_DOCSTRINGS:
+ doc = 'This is a template module just for instruction.'
+ self.assertEqual(xx.__doc__, doc)
self.assertTrue(isinstance(xx.Null(), xx.Null))
self.assertTrue(isinstance(xx.Str(), xx.Str))
|
- Issue #<I>: Fix testing when Python is configured with the
--without-doc-strings option.
|
diff --git a/treetime/merger_models.py b/treetime/merger_models.py
index <HASH>..<HASH> 100644
--- a/treetime/merger_models.py
+++ b/treetime/merger_models.py
@@ -33,12 +33,14 @@ class Coalescent(object):
Args:
- Tc: a float or an iterable, if iterable another argument T of same shape is required
- T: an array like of same shape as Tc that specifies the time pivots corresponding to Tc
+ note that this array is ordered past to present corresponding to
+ decreasing 'time before present' values
Returns:
- None
'''
if isinstance(Tc, Iterable):
if len(Tc)==len(T):
- x = np.concatenate(([-ttconf.BIG_NUMBER], T, [ttconf.BIG_NUMBER]))
+ x = np.concatenate(([ttconf.BIG_NUMBER], T, [-ttconf.BIG_NUMBER]))
y = np.concatenate(([Tc[0]], Tc, [Tc[-1]]))
self.Tc = interp1d(x,y)
else:
|
merger_models: fix problem with extremal timepoints were flipped in skyline
|
diff --git a/lib/linner/command.rb b/lib/linner/command.rb
index <HASH>..<HASH> 100644
--- a/lib/linner/command.rb
+++ b/lib/linner/command.rb
@@ -97,7 +97,6 @@ module Linner
Listen.to Linner.root, filter: /(config\.yml|Linnerfile)$/ do |modified, added, removed|
Linner.env = Environment.new Linner.config_file
Linner::Bundler.new(env.bundles).perform
- perform
end
end
|
remove extra perform in watch env
|
diff --git a/pkg/tools/cidlc/gen_rpc.go b/pkg/tools/cidlc/gen_rpc.go
index <HASH>..<HASH> 100644
--- a/pkg/tools/cidlc/gen_rpc.go
+++ b/pkg/tools/cidlc/gen_rpc.go
@@ -90,7 +90,7 @@ func (g *RPCGenerator) EmitFile(file string, pkg *Package, members []Member) err
emitHeaderWarning(w)
// Now emit the package name at the top-level.
- writefmtln(w, "package %vrpc", pkg.Name)
+ writefmtln(w, "package %v", pkg.Pkginfo.Pkg.Name())
writefmtln(w, "")
// And all of the imports that we're going to need.
|
Don't mangle RPC package names
|
diff --git a/lib/webrat/selenium/matchers.rb b/lib/webrat/selenium/matchers.rb
index <HASH>..<HASH> 100644
--- a/lib/webrat/selenium/matchers.rb
+++ b/lib/webrat/selenium/matchers.rb
@@ -1,4 +1,4 @@
require "webrat/selenium/matchers/have_xpath"
require "webrat/selenium/matchers/have_selector"
-require "webrat/selenium/matchers/have_tag"
+# require "webrat/selenium/matchers/have_tag"
require "webrat/selenium/matchers/have_content"
\ No newline at end of file
|
comment out have_tag from selenium matcher which overrides rails' have_tag
partially reverts <I>f<I>a<I>c<I>d<I>a<I>f<I>af6a<I>b3
|
diff --git a/src/query/FindAll.php b/src/query/FindAll.php
index <HASH>..<HASH> 100644
--- a/src/query/FindAll.php
+++ b/src/query/FindAll.php
@@ -62,6 +62,16 @@ class FindAll extends \UniMapper\Query implements IConditionable
$result = false;
$entityMappers = $this->entityReflection->getMappers();
+ // Add properties from conditions to the selection if not set
+ if (count($this->conditions) > 0 && count($this->selection) > 0) {
+ foreach ($this->conditions as $condition) {
+ $propertyName = $condition->getExpression();
+ if (!isset($this->selection[$propertyName])) {
+ $this->selection[] = $propertyName;
+ }
+ }
+ }
+
foreach ($this->mappers as $mapper) {
if (isset($entityMappers[get_class($mapper)])) {
|
queries: FindAll - fixed missing properties in selection if conditions set
|
diff --git a/router/api/router_test.go b/router/api/router_test.go
index <HASH>..<HASH> 100644
--- a/router/api/router_test.go
+++ b/router/api/router_test.go
@@ -365,7 +365,7 @@ func newFakeRouter(c *check.C) *fakeRouterAPI {
r.HandleFunc("/certificate/{cname}", api.getCertificate).Methods(http.MethodGet)
r.HandleFunc("/certificate/{cname}", api.addCertificate).Methods(http.MethodPut)
r.HandleFunc("/certificate/{cname}", api.removeCertificate).Methods(http.MethodDelete)
- listener, err := net.Listen("tcp", "")
+ listener, err := net.Listen("tcp", "127.0.0.1:0")
c.Assert(err, check.IsNil)
api.listener = listener
api.endpoint = fmt.Sprintf("http://%s", listener.Addr().String())
|
router/api: listen on localhost on tests
|
diff --git a/examples/26-new-order.php b/examples/26-new-order.php
index <HASH>..<HASH> 100644
--- a/examples/26-new-order.php
+++ b/examples/26-new-order.php
@@ -46,7 +46,7 @@ try {
"orderNumber" => "1337",
"redirectUrl" => "https://example.org/redirect",
"webhookUrl" => "https://example.org/webhook",
- "method" => "klarnapaylater",
+ "method" => "ideal",
"lines" => [
[
"sku" => "5702016116977",
|
Switched method to default supported ideal
|
diff --git a/src/Enum/CurrencyCode.php b/src/Enum/CurrencyCode.php
index <HASH>..<HASH> 100644
--- a/src/Enum/CurrencyCode.php
+++ b/src/Enum/CurrencyCode.php
@@ -94,6 +94,7 @@ class CurrencyCode
const LKR = 'LKR';
const LRD = 'LRD';
const LSL = 'LSL';
+ const LTC = 'LTC';
const LTL = 'LTL';
const LVL = 'LVL';
const LYD = 'LYD';
|
Added missing code for LTC currency.
|
diff --git a/bin/tools/utils.js b/bin/tools/utils.js
index <HASH>..<HASH> 100644
--- a/bin/tools/utils.js
+++ b/bin/tools/utils.js
@@ -199,13 +199,13 @@ fs.copyFileSync("bin/build/qx.cmd", "tmp/qx.cmd");
if (result.exitCode) {
process.exit(result.exitCode);
}
-
- console.log("Compiling and deploy build version");
- result = await runCommand(".", "node", "./tmp/qx", "deploy", "--target=build", "--clean", "-M");
+
+ console.log("Compiling build version");
+ result = await runCommand(".", "node", "./tmp/qx", "compile", "--target=build", "--clean", "-M");
if (result.exitCode) {
process.exit(result.exitCode);
}
-
+
console.log("Compiler successfully bootstrapped");
}
|
back to just compile instead of deploy
|
diff --git a/docker/version.py b/docker/version.py
index <HASH>..<HASH> 100644
--- a/docker/version.py
+++ b/docker/version.py
@@ -1,2 +1,2 @@
-version = "2.5.0"
+version = "2.6.0-dev"
version_info = tuple([int(d) for d in version.split("-")[0].split(".")])
|
Bump <I>-dev
|
diff --git a/src/uiSelectController.js b/src/uiSelectController.js
index <HASH>..<HASH> 100644
--- a/src/uiSelectController.js
+++ b/src/uiSelectController.js
@@ -149,7 +149,7 @@ uis.controller('uiSelectCtrl',
ctrl.setItemsFn(data);
}else{
if ( data !== undefined ) {
- var filteredItems = data.filter(function(i) {return selectedItems.indexOf(i) < 0;});
+ var filteredItems = data.filter(function(i) {return selectedItems && selectedItems.indexOf(i) < 0;});
ctrl.setItemsFn(filteredItems);
}
}
diff --git a/src/uiSelectMultipleDirective.js b/src/uiSelectMultipleDirective.js
index <HASH>..<HASH> 100644
--- a/src/uiSelectMultipleDirective.js
+++ b/src/uiSelectMultipleDirective.js
@@ -56,7 +56,7 @@ uis.directive('uiSelectMultiple', ['uiSelectMinErr','$timeout', function(uiSelec
ctrl.getPlaceholder = function(){
//Refactor single?
- if($select.selected.length) return;
+ if($select.selected && $select.selected.length) return;
return $select.placeholder;
};
|
Solving bug when selectItems is undefined.
|
diff --git a/agrona/src/test/java/org/agrona/concurrent/AgentInvokerTest.java b/agrona/src/test/java/org/agrona/concurrent/AgentInvokerTest.java
index <HASH>..<HASH> 100644
--- a/agrona/src/test/java/org/agrona/concurrent/AgentInvokerTest.java
+++ b/agrona/src/test/java/org/agrona/concurrent/AgentInvokerTest.java
@@ -146,6 +146,7 @@ public class AgentInvokerTest
when(mockAgent.doWork()).thenThrow(new ClosedByInterruptException());
assertExceptionNotReported();
+ assertTrue(Thread.interrupted()); // by throwing ClosedByInterruptException
}
@Test
@@ -167,6 +168,7 @@ public class AgentInvokerTest
});
assertExceptionNotReported();
+ assertTrue(Thread.interrupted()); // by throwing ClosedByInterruptException
}
private void assertExceptionNotReported()
|
[Java] Clear the interrupted flag on the main thread to ensure that further tests will not be affected
|
diff --git a/lib/featuresLoader.js b/lib/featuresLoader.js
index <HASH>..<HASH> 100644
--- a/lib/featuresLoader.js
+++ b/lib/featuresLoader.js
@@ -23,7 +23,7 @@ const createCucumber = (
window.cucumberJson = ${JSON.stringify(cucumberJson)};
var moduleCache = arguments[5];
-
+
function clearFromCache(moduleId, instance){
if(isWebpack()){
delete require.cache[moduleId];
@@ -31,7 +31,7 @@ const createCucumber = (
clearFromCacheBrowserify(instance);
}
}
-
+
function isWebpack(){
return !!require.cache
}
@@ -60,10 +60,10 @@ const createCucumber = (
nonGlobalToRequire
.find(fileSteps => fileSteps[filePath])
[filePath].join("\n")}
-
- createTestsFromFeature('${path.basename(filePath)}', \`${jsStringEscape(
+
+ createTestsFromFeature('${path.basename(filePath)}', '${jsStringEscape(
spec
- )}\`);
+ )}');
})
`
)
|
fix(featuresloader.js): pass spec as string to createTestsFromFeature fn
All test cases now passing
fix #<I>
|
diff --git a/src/Propel/Generator/Reverse/MysqlSchemaParser.php b/src/Propel/Generator/Reverse/MysqlSchemaParser.php
index <HASH>..<HASH> 100644
--- a/src/Propel/Generator/Reverse/MysqlSchemaParser.php
+++ b/src/Propel/Generator/Reverse/MysqlSchemaParser.php
@@ -17,7 +17,10 @@ use Task;
use PDO;
use Propel\Generator\Model\Column;
use Propel\Generator\Model\Database;
+use Propel\Generator\Model\ForeignKey;
+use Propel\Generator\Model\Index;
use Propel\Generator\Model\Table;
+use Propel\Generator\Model\Unique;
use Propel\Generator\Model\PropelTypes;
use Propel\Generator\Model\ColumnDefaultValue;
|
[Generator] [Reverse] Added missing use statements
|
diff --git a/lib/deep_cover/custom_requirer.rb b/lib/deep_cover/custom_requirer.rb
index <HASH>..<HASH> 100644
--- a/lib/deep_cover/custom_requirer.rb
+++ b/lib/deep_cover/custom_requirer.rb
@@ -133,11 +133,14 @@ module DeepCover
found_path = resolve_path(path)
- DeepCover.autoload_tracker.wrap_require(path, found_path) do
- return yield(:not_found) unless found_path
-
+ if found_path
return false if @loaded_features.include?(found_path)
return false if @paths_being_required.include?(found_path)
+ end
+
+ DeepCover.autoload_tracker.wrap_require(path, found_path) do
+ # Either a problem with resolve_path, or a gem that will be added to the load_path by RubyGems
+ return yield(:not_found) unless found_path
begin
@paths_being_required.add(found_path)
|
Avoid wrap_require for already loaded paths
|
diff --git a/ghost/release-utils/lib/releases.js b/ghost/release-utils/lib/releases.js
index <HASH>..<HASH> 100644
--- a/ghost/release-utils/lib/releases.js
+++ b/ghost/release-utils/lib/releases.js
@@ -108,6 +108,7 @@ module.exports.uploadZip = (options = {}) => {
return new Promise((resolve, reject) => {
fs.createReadStream(options.zipPath)
+ .on('error', reject)
.pipe(request.post(reqOptions, (err, res) => {
if (err) {
return reject(err);
|
Added error handling to filestream
This would have probably rejected the promise anyway because uncaught
error, but it's better to be explicit
|
diff --git a/www/src/Lib/turtle.py b/www/src/Lib/turtle.py
index <HASH>..<HASH> 100644
--- a/www/src/Lib/turtle.py
+++ b/www/src/Lib/turtle.py
@@ -241,7 +241,7 @@ class TurtleScreenBase:
_turtle = _svg.polygon(points=" ".join(_shape),
transform="rotate(%s)" % (lineitem.heading() - 90),
style={'stroke': fill, 'fill': fill,
- 'stroke-width': width, 'display': 'none'})
+ 'stroke-width': 1, 'display': 'none'})
_turtle <= _svg.animateMotion(From="%s,%s" % (_x0*self.xscale, _y0*self.yscale),
to="%s,%s" % (_x1*self.xscale, _y1*self.yscale),
|
fixed sub-issue <I> of issue #<I>: turtle drawing is drawn the same regardless of width setting
|
diff --git a/basiccache.gemspec b/basiccache.gemspec
index <HASH>..<HASH> 100644
--- a/basiccache.gemspec
+++ b/basiccache.gemspec
@@ -1,6 +1,6 @@
Gem::Specification.new do |s|
s.name = 'basiccache'
- s.version = '0.2.1'
+ s.version = '0.2.2'
s.date = Time.now.strftime("%Y-%m-%d")
s.summary = 'Provides a minimal key/value caching layer'
s.description = "Allows an application to dynamically cache values and retrieve them later"
diff --git a/lib/basiccache/stores/nullstore.rb b/lib/basiccache/stores/nullstore.rb
index <HASH>..<HASH> 100644
--- a/lib/basiccache/stores/nullstore.rb
+++ b/lib/basiccache/stores/nullstore.rb
@@ -7,7 +7,7 @@ module BasicCache
##
# Generate an empty store
- def initialize
+ def initialize(_ = {})
@raw = nil
end
diff --git a/lib/basiccache/stores/store.rb b/lib/basiccache/stores/store.rb
index <HASH>..<HASH> 100644
--- a/lib/basiccache/stores/store.rb
+++ b/lib/basiccache/stores/store.rb
@@ -7,7 +7,7 @@ module BasicCache
##
# Generate an empty store
- def initialize
+ def initialize(_ = {})
@raw = {}
end
|
standardize that stores accept a hash
|
diff --git a/webpack.config.js b/webpack.config.js
index <HASH>..<HASH> 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -31,7 +31,7 @@ module.exports = {
devtool: BUILD ? false : 'source-map',
plugins: BUILD ? [
new webpack.optimize.UglifyJsPlugin({compress: {warnings: true}}),
- new webpack.BannerPlugin({raw: true,
- banner: `/*! ${PKG.title || PKG.name} v${PKG.version} (c) ${PKG.author.name} ${PKG.homepage} */`})
+ new webpack.BannerPlugin(
+ `${PKG.title || PKG.name} v${PKG.version} (c) ${PKG.author.name} ${PKG.homepage}`)
] : []
};
|
Change option for webpack.BannerPlugin
|
diff --git a/lib/CharacteristicDelegate.js b/lib/CharacteristicDelegate.js
index <HASH>..<HASH> 100644
--- a/lib/CharacteristicDelegate.js
+++ b/lib/CharacteristicDelegate.js
@@ -208,7 +208,7 @@ class CharacteristicDelegate extends homebridgeLib.Delegate {
)
if (value !== this.value) {
this._serviceDelegate._context[this._key] = value
- this.emit('didSet', value)
+ this.emit('didSet', value, false)
}
callback(null, value)
} catch (error) {
|
Update CharacteristicDelegate.js
Bug fix: missing `fromHomeKit` parameneter to `didSet` event.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@ setup(name='dotenv',
description='Handle .env files',
author='Pedro Burón',
author_email='pedro@witoi.com',
- url='http://witoi.github.com',
+ url='https://github.com/pedroburon/dotenv',
test_suite='nose.collector',
packages=['dotenv'],
tests_require=['nose'],
|
setup.py: Update url
|
diff --git a/lib/quorum.rb b/lib/quorum.rb
index <HASH>..<HASH> 100644
--- a/lib/quorum.rb
+++ b/lib/quorum.rb
@@ -1,6 +1,7 @@
require "quorum/engine"
require "quorum/helpers"
require "quorum/sequence"
+require "quorum/version"
require "resque"
require "resque/server"
require "resque-result"
|
Added require quorum version.
|
diff --git a/salt/utils/http.py b/salt/utils/http.py
index <HASH>..<HASH> 100644
--- a/salt/utils/http.py
+++ b/salt/utils/http.py
@@ -170,6 +170,7 @@ def query(url,
data_file, data_render, data_renderer, template_dict, opts
)
+ log.debug('Using {0} Method'.format(method))
if method == 'POST':
log.trace('POST Data: {0}'.format(pprint.pformat(data)))
@@ -272,7 +273,6 @@ def query(url,
log.error('The client-side certificate path that was passed is '
'not valid: {0}'.format(cert))
- log.debug('data type {0}'.format(type(data)))
result = sess.request(
method, url, params=params, data=data, **req_kwargs
)
@@ -281,7 +281,6 @@ def query(url,
return {'handle': result}
log.debug(result.url)
- log.debug(result.request.__dict__)
log.trace(data)
result_status_code = result.status_code
|
Removing unneeded logging statements. Adding log statement that was mistakenly removed.
|
diff --git a/test/k8sT/Tunnels.go b/test/k8sT/Tunnels.go
index <HASH>..<HASH> 100644
--- a/test/k8sT/Tunnels.go
+++ b/test/k8sT/Tunnels.go
@@ -39,7 +39,6 @@ var _ = Describe("K8sValidatedTunnelTest", func() {
demoDSPath = helpers.ManifestGet("demo_ds.yaml")
kubectl.Exec("kubectl -n kube-system delete ds cilium")
- // Expect(res.Correct()).Should(BeTrue())
waitToDeleteCilium(kubectl, logger)
})
@@ -50,10 +49,7 @@ var _ = Describe("K8sValidatedTunnelTest", func() {
})
AfterEach(func() {
- _ = kubectl.Delete(demoDSPath)
- })
-
- AfterAll(func() {
+ kubectl.Delete(demoDSPath)
ExpectAllPodsTerminated(kubectl)
})
|
Test: K8s/Tunnels wait until all pods terminate
Have seen in a PR that the pods are deleted on the `AfterEach` but never
wait until it was terminated, the next test started installing the pods
and it was still present.
With this change test waits until all pods are being termintated
correctly.
|
diff --git a/extensions/gedit3-plugin/shoebotit/__init__.py b/extensions/gedit3-plugin/shoebotit/__init__.py
index <HASH>..<HASH> 100644
--- a/extensions/gedit3-plugin/shoebotit/__init__.py
+++ b/extensions/gedit3-plugin/shoebotit/__init__.py
@@ -101,8 +101,6 @@ class ShoebotThread(threading.Thread):
try:
if proc.returncode != 0:
panel.set_property("visible", True)
- else:
- textbuffer.insert(textbuffer.get_end_iter(), "Shoebot finished.")
except Exception, e:
textbuffer.insert(textbuffer.get_end_iter(), str(e))
@@ -288,8 +286,11 @@ class ShoebotPlugin(GObject.Object, Gedit.WindowActivatable):
image = Gtk.Image()
image.set_from_stock(Gtk.STOCK_EXECUTE, Gtk.IconSize.BUTTON)
+ scrolled_window = Gtk.ScrolledWindow()
+ scrolled_window.add(self.text)
+ scrolled_window.show_all()
- self.panel.add_item(self.text, 'Shoebot', 'Shoebot', image)
+ self.panel.add_item(scrolled_window, 'Shoebot', 'Shoebot', image)
self.instances[self.window] = ShoebotWindowHelper(self, self.window)
|
Gedit plugin output gains scrollbars.
|
diff --git a/lib/scorpio/model.rb b/lib/scorpio/model.rb
index <HASH>..<HASH> 100644
--- a/lib/scorpio/model.rb
+++ b/lib/scorpio/model.rb
@@ -206,7 +206,7 @@ module Scorpio
end ||
schema['additionalProperties']
{key => response_object_to_instances(value, schema_for_value)}
- end.inject({}, &:update)
+ end.inject(object.class.new, &:update)
elsif schema['type'] == 'array' && MODULES_FOR_JSON_SCHEMA_TYPES['array'].any? { |m| object.is_a?(m) }
object.map do |element|
response_object_to_instances(element, schema['items'])
|
m fixes for response_object_to_instances with object schema
|
diff --git a/konch.py b/konch.py
index <HASH>..<HASH> 100644
--- a/konch.py
+++ b/konch.py
@@ -356,10 +356,18 @@ def use_file(filename):
logger.info('Using {0}'.format(config_file))
# Ensure that relative imports are possible
__ensure_directory_in_path(config_file)
+ mod = None
try:
- return imp.load_source('konchrc', config_file)
+ mod = imp.load_source('konchrc', config_file)
except UnboundLocalError: # File not found
pass
+ else:
+ try:
+ # Clean up bytecode file on PY2
+ os.remove(config_file + 'c')
+ except FileNotFoundError:
+ pass
+ return mod
if not config_file:
warnings.warn('No config file found.')
else:
|
Clean up bytecode file on PY2
|
diff --git a/src/filesystem/impls/appshell/AppshellFileSystem.js b/src/filesystem/impls/appshell/AppshellFileSystem.js
index <HASH>..<HASH> 100644
--- a/src/filesystem/impls/appshell/AppshellFileSystem.js
+++ b/src/filesystem/impls/appshell/AppshellFileSystem.js
@@ -35,6 +35,9 @@ define(function (require, exports, module) {
var FILE_WATCHER_BATCH_TIMEOUT = 200; // 200ms - granularity of file watcher changes
+ /** exclude .git files from warnings as they appear and disappear very quickly and pollute the console */
+ var warningBlacklist = /\/\.git\//;
+
/**
* Callback to notify FileSystem of watcher changes
* @type {?function(string, FileSystemStats=)}
@@ -91,7 +94,9 @@ define(function (require, exports, module) {
if (needsStats) {
exports.stat(path, function (err, stats) {
if (err) {
- console.warn("Unable to stat changed path: ", path, err);
+ if (!warningBlacklist.test(path)) {
+ console.warn("Unable to stat changed path: ", path, err);
+ }
return;
}
_changeCallback(path, stats);
|
Exclude .git files from console warnings
|
diff --git a/escpos/impl/epson.py b/escpos/impl/epson.py
index <HASH>..<HASH> 100644
--- a/escpos/impl/epson.py
+++ b/escpos/impl/epson.py
@@ -178,6 +178,17 @@ class GenericESCPOS(object):
self.device.write('\x1B\x61\x02')
+ def set_code_page(self, code_page):
+ """Set code page for character printing. This can be used in combination
+ with bytearray to convert encoding. For example:
+
+ for char in bytearray(unicode_text, 'cp1251'):
+ printer.device.write(chr(char))
+ """
+ assert code_page >= 0 and code_page <= 255
+ self.device.write('\x1B\x74' + chr(code_page))
+
+
def set_text_size(self, width, height):
if (0 <= width <= 7) and (0 <= height <= 7):
size = 16 * width + height
|
Base: Implemented code page setting.
|
diff --git a/src/TestBootstrap.php b/src/TestBootstrap.php
index <HASH>..<HASH> 100644
--- a/src/TestBootstrap.php
+++ b/src/TestBootstrap.php
@@ -1,7 +1,5 @@
<?php
-require_once 'App.php';
-
use infuse\Util;
use app\search\libs\SearchableModel;
|
do not require app in test bootstrap
|
diff --git a/oauthlib/__init__.py b/oauthlib/__init__.py
index <HASH>..<HASH> 100644
--- a/oauthlib/__init__.py
+++ b/oauthlib/__init__.py
@@ -10,7 +10,7 @@
"""
__author__ = 'Idan Gazit <idan@gazit.me>'
-__version__ = '1.1.0'
+__version__ = '1.1.1'
import logging
|
Bumped version to <I>.
|
diff --git a/src/Psalm/Checker/StatementsChecker.php b/src/Psalm/Checker/StatementsChecker.php
index <HASH>..<HASH> 100644
--- a/src/Psalm/Checker/StatementsChecker.php
+++ b/src/Psalm/Checker/StatementsChecker.php
@@ -1795,7 +1795,7 @@ class StatementsChecker
// Hack has a similar issue: https://github.com/facebook/hhvm/issues/5164
if ($lhs_type_part->isObject() || in_array(strtolower($lhs_type_part->value), ['stdclass', 'simplexmlelement', 'dateinterval', 'domdocument', 'domnode'])) {
$context->vars_in_scope[$var_id] = Type::getMixed();
- continue;
+ return;
}
if (self::isMock($lhs_type_part->value)) {
|
Exit properly when encountering classes we cannot deal with
|
diff --git a/hadoopy/__init__.py b/hadoopy/__init__.py
index <HASH>..<HASH> 100644
--- a/hadoopy/__init__.py
+++ b/hadoopy/__init__.py
@@ -24,3 +24,4 @@ from _reporter import status, counter
from _test import Test
import _typedbytes as typedbytes
import _main
+from _main import GroupedValues
|
Made the value iterator public as the user gets an instance in the reducer
|
diff --git a/lib/fast_find.rb b/lib/fast_find.rb
index <HASH>..<HASH> 100644
--- a/lib/fast_find.rb
+++ b/lib/fast_find.rb
@@ -99,7 +99,7 @@ module FastFind
[path, path.encoding]
end
- def one_shot?() !!@one_shot end
+ def one_shot?() @one_shot end
def yield_entry(entry, block)
if block.arity == 2
|
I really don't care if this is actually a Boolean.
|
diff --git a/src/combinators/delay.js b/src/combinators/delay.js
index <HASH>..<HASH> 100644
--- a/src/combinators/delay.js
+++ b/src/combinators/delay.js
@@ -71,9 +71,12 @@ export const debounce = curry((n, s) => {
emit.complete()
}
- s.subscribe({ ...emit, next, complete })
+ const subscription = s.subscribe({ ...emit, next, complete })
- return () => clearTimeout(id)
+ return () => {
+ clearTimeout(id)
+ subscription.unsubscribe()
+ }
})
})
diff --git a/src/combinators/delay.test.js b/src/combinators/delay.test.js
index <HASH>..<HASH> 100644
--- a/src/combinators/delay.test.js
+++ b/src/combinators/delay.test.js
@@ -78,6 +78,16 @@ describe('delay', () => {
debounce(1000)(s).subscribe({ error: errorSpy })
expect(errorSpy).toHaveBeenCalledTimes(1)
})
+
+ it('unmounts the original signal when it is unsubscribed', () => {
+ const unmount = jest.fn()
+ const s = new Signal(() => unmount)
+ const a = debounce(1000)(s).subscribe()
+
+ a.unsubscribe()
+
+ expect(unmount).toHaveBeenCalledTimes(1)
+ })
})
describe('#throttle', () => {
|
Fix issue where debounced signals weren't unmounted properly
|
diff --git a/mackup/appsdb.py b/mackup/appsdb.py
index <HASH>..<HASH> 100644
--- a/mackup/appsdb.py
+++ b/mackup/appsdb.py
@@ -98,7 +98,7 @@ class ApplicationsDatabase(object):
name (str)
Returns:
- set(str)
+ set of str.
"""
return self.apps[name]['configuration_files']
@@ -107,7 +107,7 @@ class ApplicationsDatabase(object):
Return the list of application names that are available in the database
Returns:
- set of str
+ set of str.
"""
app_names = set()
for name in self.apps:
@@ -120,10 +120,10 @@ class ApplicationsDatabase(object):
Return the list of pretty app names that are available in the database
Returns:
- list(str)
+ set of str.
"""
- pretty_app_names = []
+ pretty_app_names = set()
for app_name in self.get_app_names():
- pretty_app_names.append(self.get_name(app_name))
+ pretty_app_names.add(self.get_name(app_name))
return pretty_app_names
|
Let's use a set here too
|
diff --git a/files/tests/externallib_test.php b/files/tests/externallib_test.php
index <HASH>..<HASH> 100644
--- a/files/tests/externallib_test.php
+++ b/files/tests/externallib_test.php
@@ -147,4 +147,27 @@ class test_external_files extends advanced_testcase {
$filename, $filecontent, $contextlevel, $instanceid);
}
+ /*
+ * Make sure core_files_external::upload() works without new parameters.
+ */
+ public function test_upload_without_new_param() {
+ global $USER;
+
+ $this->resetAfterTest();
+ $this->setAdminUser();
+ $context = context_user::instance($USER->id);
+ $contextid = $context->id;
+ $component = "user";
+ $filearea = "private";
+ $itemid = 0;
+ $filepath = "/";
+ $filename = "Simple4.txt";
+ $filecontent = base64_encode("Let us create a nice simple file");
+
+ // Make sure the file is created.
+ @core_files_external::upload($contextid, $component, $filearea, $itemid, $filepath, $filename, $filecontent);
+ $browser = get_file_browser();
+ $file = $browser->get_file_info($context, $component, $filearea, $itemid, $filepath, $filename);
+ $this->assertNotEmpty($file);
+ }
}
\ No newline at end of file
|
MDL-<I> phpunit: Test core_files_external::upload() without the new params
|
diff --git a/superset/datasets/commands/create.py b/superset/datasets/commands/create.py
index <HASH>..<HASH> 100644
--- a/superset/datasets/commands/create.py
+++ b/superset/datasets/commands/create.py
@@ -61,7 +61,7 @@ class CreateDatasetCommand(BaseCommand):
)
db.session.commit()
except (SQLAlchemyError, DAOCreateFailedError) as ex:
- logger.exception(ex)
+ logger.warning(ex, exc_info=True)
db.session.rollback()
raise DatasetCreateFailedError()
return dataset
|
fix(datasets): log create exceptions as warning (#<I>)
|
diff --git a/api/response.go b/api/response.go
index <HASH>..<HASH> 100644
--- a/api/response.go
+++ b/api/response.go
@@ -4,6 +4,7 @@ import (
"encoding/json"
"fmt"
"github.com/Sirupsen/logrus"
+ "runtime/debug"
"strings"
)
@@ -68,6 +69,9 @@ func ResponseLogAndError(v interface{}) {
} else if e, ok := v.(error); ok {
logrus.Errorf(fmt.Sprint(e))
ResponseError(fmt.Sprint(e))
+ } else {
+ logrus.Fatalf("%s: %s", v, debug.Stack())
+ ResponseError("Caught FATAL error: %s", v)
}
}
|
Expose system error from go
It was covered by accident before.
|
diff --git a/pkg/sti/docker/docker.go b/pkg/sti/docker/docker.go
index <HASH>..<HASH> 100644
--- a/pkg/sti/docker/docker.go
+++ b/pkg/sti/docker/docker.go
@@ -99,6 +99,7 @@ func (d *stiDocker) IsImageInLocalRegistry(imageName string) (bool, error) {
func (d *stiDocker) CheckAndPull(imageName string) (image *docker.Image, err error) {
if image, err = d.client.InspectImage(imageName); err != nil &&
err != docker.ErrNoSuchImage {
+ log.Printf("Error: Unable to get image metadata for %s: %v", imageName, err)
return nil, errors.ErrPullImageFailed
}
|
print image name on failure to get scripts
|
diff --git a/functions/timber-menu.php b/functions/timber-menu.php
index <HASH>..<HASH> 100644
--- a/functions/timber-menu.php
+++ b/functions/timber-menu.php
@@ -38,16 +38,18 @@ class TimberMenu extends TimberCore {
*/
private function init($menu_id) {
$menu = wp_get_nav_menu_items($menu_id);
- _wp_menu_item_classes_by_context($menu);
- if (is_array($menu)){
- $menu = self::order_children($menu);
+ if ($menu) {
+ _wp_menu_item_classes_by_context($menu);
+ if (is_array($menu)){
+ $menu = self::order_children($menu);
+ }
+ $this->items = $menu;
+ $menu_info = wp_get_nav_menu_object($menu_id);
+ $this->import($menu_info);
+ $this->ID = $this->term_id;
+ $this->id = $this->term_id;
+ $this->title = $this->name;
}
- $this->items = $menu;
- $menu_info = wp_get_nav_menu_object($menu_id);
- $this->import($menu_info);
- $this->ID = $this->term_id;
- $this->id = $this->term_id;
- $this->title = $this->name;
}
/**
|
added a sanity check so that we don't send blank menus to WP for processing
|
diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js
index <HASH>..<HASH> 100644
--- a/src/nls/root/strings.js
+++ b/src/nls/root/strings.js
@@ -852,7 +852,6 @@ define({
"WARNING_TYPE" : "Warning!",
"CLICK_RESTART_TO_UPDATE" : "Click Restart to update Brackets.",
"UPDATE_ON_NEXT_LAUNCH" : "The update will be applied on relaunch.",
- "VALIDATE_EXTENSIONS" : "Please validate all your extensions.",
"GO_TO_SITE" : "Go to <a href = \"http://brackets.io/\"> brackets.io </a> to retry.",
"INTERNET_UNAVAILABLE" : "No Internet connection available.",
"UPDATEDIR_READ_FAILED" : "Update directory could not be read.",
@@ -863,6 +862,8 @@ define({
"CHECKSUM_DID_NOT_MATCH" : "Checksum didn't match.",
"INSTALLER_NOT_FOUND" : "Installer not found.",
"DOWNLOAD_ERROR" : "Error occurred while downloading.",
+ "RESTART_BUTTON" : "Restart",
+ "LATER_BUTTON" : "Later",
// Strings for Related Files
"CMD_FIND_RELATED_FILES" : "Find Related Files"
|
Adding remaining strings for Auto Update feature (#<I>)
* Adding strings for AutoUpdate and Related Files features
* Addressing spacing issues
* Normalizing whitespaces with spaces:4
Normalizing whitespaces with spaces:4
* Adding remaining strings for AutoUpdate feature
* Removing unused string
|
diff --git a/androguard/core/analysis/analysis.py b/androguard/core/analysis/analysis.py
index <HASH>..<HASH> 100644
--- a/androguard/core/analysis/analysis.py
+++ b/androguard/core/analysis/analysis.py
@@ -17,7 +17,8 @@
import re, random, cPickle
-from androguard.core.androconf import error, warning, debug, is_ascii_problem
+from androguard.core.androconf import error, warning, debug, is_ascii_problem,\
+ load_api_specific_resource_module
from androguard.core.bytecodes import dvm
from androguard.core.bytecodes.api_permissions import DVM_PERMISSIONS_BY_PERMISSION, DVM_PERMISSIONS_BY_ELEMENT
@@ -945,6 +946,9 @@ class TaintedPackages(object):
self.__vm = _vm
self.__packages = {}
self.__methods = {}
+
+ self.AOSP_PERMISSIONS_MODULE = load_api_specific_resource_module("aosp_permissions", self.__vm.get_api_version())
+ self.API_PERMISSION_MAPPINGS_MODULE = load_api_specific_resource_module("api_permission_mappings", self.__vm.get_api_version())
def _add_pkg(self, name):
if name not in self.__packages:
|
Added functionality to load api specific resources to TaintedPackages
|
diff --git a/src/Client.php b/src/Client.php
index <HASH>..<HASH> 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -23,7 +23,7 @@ class Client
*/
private $options = array(
'base_url' => 'https://secure.eloqua.com/API/REST',
- 'version' => '1.0',
+ 'version' => '2.0',
'user_agent' => 'Elomentary (http://github.com/tableau-mkt/elomentary)',
'timeout' => 10,
'count' => 100,
diff --git a/src/HttpClient/HttpClient.php b/src/HttpClient/HttpClient.php
index <HASH>..<HASH> 100644
--- a/src/HttpClient/HttpClient.php
+++ b/src/HttpClient/HttpClient.php
@@ -23,7 +23,7 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface;
class HttpClient implements HttpClientInterface {
protected $options = array(
'base_url' => 'https://secure.eloqua.com/API/REST',
- 'version' => '1.0',
+ 'version' => '2.0',
'user_agent' => 'Elomentary (http://github.com/tableau-mkt/elomentary)',
'timeout' => 10,
'count' => 100,
|
Default to the <I> REST API.
|
diff --git a/lib/attrtastic/semantic_attributes_builder.rb b/lib/attrtastic/semantic_attributes_builder.rb
index <HASH>..<HASH> 100644
--- a/lib/attrtastic/semantic_attributes_builder.rb
+++ b/lib/attrtastic/semantic_attributes_builder.rb
@@ -193,7 +193,7 @@ module Attrtastic
value_options[:html][:class] = [ options[:html][:class], value.class.to_s.underscore ].compact.join(" ")
attributes_for(value, args, options, &block)
- end.join
+ end.join.html_safe
end
end
diff --git a/lib/attrtastic/version.rb b/lib/attrtastic/version.rb
index <HASH>..<HASH> 100644
--- a/lib/attrtastic/version.rb
+++ b/lib/attrtastic/version.rb
@@ -1,3 +1,3 @@
module Attrtastic
- VERSION = "0.3.1"
+ VERSION = "0.3.2"
end
|
Fix problem with attributes :for and not safe join on attributes
|
diff --git a/cmd/cmd_controller.js b/cmd/cmd_controller.js
index <HASH>..<HASH> 100644
--- a/cmd/cmd_controller.js
+++ b/cmd/cmd_controller.js
@@ -14,7 +14,7 @@ class EmbarkController {
// set a default context. should be overwritten by an action
// method before being used
- this.context = [constants.contexts.any];
+ this.context = {};
}
initConfig(env, options) {
diff --git a/embark-ui/src/reducers/selectors.js b/embark-ui/src/reducers/selectors.js
index <HASH>..<HASH> 100644
--- a/embark-ui/src/reducers/selectors.js
+++ b/embark-ui/src/reducers/selectors.js
@@ -53,7 +53,6 @@ export function getProcesses(state) {
}
export function getProcessLogs(state) {
- if(!state.entities.processLogs.length) return [];
const processLogsObj = state.entities.processLogs.reduce((processLogs, processLog) => {
const existingProcessLog = processLogs[processLog.process];
if(!existingProcessLog || processLog.timestamp > existingProcessLog.timestamp){
|
Minor PR comments
Removed a null check and intialised `this.context` to an empty object.
|
diff --git a/lib/wavefile/chunk_readers/smpl_chunk_reader.rb b/lib/wavefile/chunk_readers/smpl_chunk_reader.rb
index <HASH>..<HASH> 100644
--- a/lib/wavefile/chunk_readers/smpl_chunk_reader.rb
+++ b/lib/wavefile/chunk_readers/smpl_chunk_reader.rb
@@ -93,13 +93,13 @@ module WaveFile
def loop_type(loop_type_id)
case loop_type_id
when 0
- 'Forward'
+ :forward
when 1
- 'Alternating'
+ :alternating
when 2
- 'Backward'
+ :backward
else
- 'Unknown'
+ :unknown
end
end
|
Using symbols instead of strings, to match style of rest of code
|
diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb
index <HASH>..<HASH> 100644
--- a/lib/puppet/parser/scope.rb
+++ b/lib/puppet/parser/scope.rb
@@ -87,6 +87,10 @@ class Puppet::Parser::Scope
@compiler.node.name
end
+ def include?(name)
+ self[name] != :undefined
+ end
+
# Is the value true? This allows us to control the definition of truth
# in one place.
def self.true?(value)
diff --git a/spec/unit/parser/scope_spec.rb b/spec/unit/parser/scope_spec.rb
index <HASH>..<HASH> 100755
--- a/spec/unit/parser/scope_spec.rb
+++ b/spec/unit/parser/scope_spec.rb
@@ -113,6 +113,15 @@ describe Puppet::Parser::Scope do
@scope["var"].should == "childval"
end
+ it "should be able to detect when variables are set" do
+ @scope["var"] = "childval"
+ @scope.should be_include("var")
+ end
+
+ it "should be able to detect when variables are not set" do
+ @scope.should_not be_include("var")
+ end
+
describe "and the variable is qualified" do
before do
@compiler = Puppet::Parser::Compiler.new(Puppet::Node.new("foonode"))
|
Adding Scope#include? method
This is primarily for Hiera/DataLibrary support,
but is a decent idea regardless.
|
diff --git a/index.php b/index.php
index <HASH>..<HASH> 100644
--- a/index.php
+++ b/index.php
@@ -88,6 +88,9 @@
$PAGE->set_heading($SITE->fullname);
echo $OUTPUT->header();
+ //TODO: remove this notice once admins know they need to switch CVS and git branches, the reason is once we start changing DB there will not be any way back!
+ echo $OUTPUT->box('WARNING: this site is using 2.1dev codebase, please make sure this is is not a production server!!!', 'errorbox');
+
/// Print Section
if ($SITE->numsections > 0) {
|
MDL-<I> make sure admins do not upgrade to <I>dev accidentally
We already have the new maturity warning in the upgrade page but we are not changing versions yet, we should better give admins one extra chance to go back to latest <I>+ stable.
|
diff --git a/config/bugsnag.php b/config/bugsnag.php
index <HASH>..<HASH> 100644
--- a/config/bugsnag.php
+++ b/config/bugsnag.php
@@ -46,8 +46,8 @@ return [
| Set to true to send the errors through to Bugsnag when the PHP process
| shuts down, in order to prevent your app waiting on HTTP requests.
|
- | Setting this to false will mean the we send an HTTP request straight away
- | for each error.
+ | Setting this to false will send an HTTP request straight away for each
+ | error.
|
*/
|
Documentation update regarding the 'Batch Sending' option (#<I>)
|
diff --git a/src/components/user-profile-personal-settings-subform/user-profile-personal-settings-subform.js b/src/components/user-profile-personal-settings-subform/user-profile-personal-settings-subform.js
index <HASH>..<HASH> 100644
--- a/src/components/user-profile-personal-settings-subform/user-profile-personal-settings-subform.js
+++ b/src/components/user-profile-personal-settings-subform/user-profile-personal-settings-subform.js
@@ -37,12 +37,12 @@ export const timeZonesToOptions = defaultMemoize(timeZones =>
*/
export const mapLocalesToOptions = defaultMemoize(locales =>
Object.entries(locales)
- .filter(([code]) => code.startsWith('en') || code.startsWith('de'))
- .map(([code, value]) => ({
- value: code,
+ .filter(([locale]) => locale.startsWith('en') || locale.startsWith('de'))
+ .map(([locale, value]) => ({
+ value: locale,
label: value.country
- ? `${value.language} (${value.country}) (${code})`
- : `${value.language} (${code})`,
+ ? `${value.language} (${value.country}) (${locale})`
+ : `${value.language} (${locale})`,
}))
);
|
refactor(user-profile): rename code to locale to be more descriptive
|
diff --git a/nbdiff/notebook_diff.py b/nbdiff/notebook_diff.py
index <HASH>..<HASH> 100644
--- a/nbdiff/notebook_diff.py
+++ b/nbdiff/notebook_diff.py
@@ -11,9 +11,7 @@ def notebook_diff(nb1, nb2):
cell_list = list()
for item in diffed_nb:
- state = item['state']
- cell = copy.deepcopy(diff_result_to_cell(item))
- cell['metadata']['state'] = state
+ cell = diff_result_to_cell(item)
cell_list.append(cell)
nb1['worksheets'][0]['cells'] = cell_list
|
Some small changes to notebook_diff.py
|
diff --git a/word2vec/wordvectors.py b/word2vec/wordvectors.py
index <HASH>..<HASH> 100644
--- a/word2vec/wordvectors.py
+++ b/word2vec/wordvectors.py
@@ -41,6 +41,21 @@ class WordVectors(object):
"""
return self.vocab_hash[word]
+ def word(self, ix):
+ """Returns the word that corresponds to the index.
+
+ Parameters
+ -------
+ ix : int
+ The index of the word
+
+ Returns
+ -------
+ str
+ The word that corresponds to the index
+ """
+ return self.vocab[ix]
+
def __getitem__(self, word):
return self.get_vector(word)
@@ -54,6 +69,22 @@ class WordVectors(object):
idx = self.ix(word)
return self.vectors[idx]
+ def get_word(self, vector):
+ """Returns the word according to the vector
+
+ Parameters
+ -------
+ vector : numpy.core.multiarray.array
+ The representing vector of the word
+
+ Returns
+ -------
+ str or None
+ The word according to the specified vector if found, else None
+ """
+ word_index = np.where(np.all(self.vectors == vector, axis=1))[0]
+ return self.word(word_index[0]) if word_index.size else None
+
def cosine(self, word, n=10):
"""
Cosine similarity.
|
Added methods for retrieving words according to index and input vector. (#<I>)
* Added methods for retrieving words according to index and input vector.
* Reformatted comments according to numpy style.
|
diff --git a/scrapelib/tests/test_cache.py b/scrapelib/tests/test_cache.py
index <HASH>..<HASH> 100644
--- a/scrapelib/tests/test_cache.py
+++ b/scrapelib/tests/test_cache.py
@@ -1,4 +1,4 @@
-from nose.tools import assert_equal, assert_in, assert_is_none
+from nose.tools import assert_equal, assert_true, assert_is_none
import requests
from ..cache import CachingSession, MemoryCache, FileCache
@@ -52,7 +52,7 @@ def test_simple_cache_request():
resp = cs.request('get', url)
assert_equal(resp.fromcache, False)
- assert_in(url, cs.cache_storage.cache)
+ assert_true(url in cs.cache_storage.cache)
# second response comes from cache
cached_resp = cs.request('get', url)
|
Py<I> doesn't have assert_in?
|
diff --git a/index/scorch/persister.go b/index/scorch/persister.go
index <HASH>..<HASH> 100644
--- a/index/scorch/persister.go
+++ b/index/scorch/persister.go
@@ -450,20 +450,23 @@ func (s *Scorch) removeOldBoltSnapshots() (numRemoved int, err error) {
}
defer func() {
if err == nil {
- err = s.rootBolt.Sync()
- }
- }()
- defer func() {
- if err == nil {
err = tx.Commit()
} else {
_ = tx.Rollback()
}
+ if err == nil {
+ err = s.rootBolt.Sync()
+ }
}()
+ snapshots := tx.Bucket(boltSnapshotsBucket)
+ if snapshots == nil {
+ return 0, nil
+ }
+
for _, epochToRemove := range epochsToRemove {
k := segment.EncodeUvarintAscending(nil, epochToRemove)
- err = tx.DeleteBucket(k)
+ err = snapshots.DeleteBucket(k)
if err == bolt.ErrBucketNotFound {
err = nil
}
|
scorch removeOldBoltSnapshots() deletes from correct bucket
|
diff --git a/kie-internal/src/main/java/org/kie/internal/command/ExtendedKieCommands.java b/kie-internal/src/main/java/org/kie/internal/command/ExtendedKieCommands.java
index <HASH>..<HASH> 100644
--- a/kie-internal/src/main/java/org/kie/internal/command/ExtendedKieCommands.java
+++ b/kie-internal/src/main/java/org/kie/internal/command/ExtendedKieCommands.java
@@ -9,4 +9,11 @@ public interface ExtendedKieCommands extends KieCommands {
public Command newEnableAuditLog( String filename );
+ public Command newClearActivationGroup(String name);
+
+ public Command newClearAgenda();
+
+ public Command newClearAgendaGroup(String name);
+
+ public Command newClearRuleFlowGroup(String name);
}
|
Adding possibility to create Clear commands using CommandFactory
|
diff --git a/src/Client/Channel/Basic/Consumer/Consumer.php b/src/Client/Channel/Basic/Consumer/Consumer.php
index <HASH>..<HASH> 100644
--- a/src/Client/Channel/Basic/Consumer/Consumer.php
+++ b/src/Client/Channel/Basic/Consumer/Consumer.php
@@ -217,6 +217,7 @@ final class Consumer implements ConsumerInterface
$frame->type() === Type::method() &&
$frame->method()->equals($deliver)
) {
+ //requeue all the messages sent right before the cancel method
$message = ($this->read)($this->connection);
$this->requeue($frame->values()->get(1)->original()->value());
}
|
add comment to explain the requeue
|
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index <HASH>..<HASH> 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -42,12 +42,14 @@ class Configuration implements ConfigurationInterface
->end()
->arrayNode('persistence')
+ ->addDefaultsIfNotSet()
->children()
->scalarNode('class')
->isRequired()
->defaultValue('Liip\TranslationBundle\Persistence\YamlFilePersistence')
->end()
->arrayNode('options')
+ ->addDefaultsIfNotSet()
->children()
->scalarNode('folder')
->defaultValue("%kernel.root_dir%/data/translations")
|
The persistence options are required by the LiipTranslationExtension. Fixes an "undefined index" issue when clearing the cache.
|
diff --git a/src/MetaModels/DcGeneral/Dca/Builder/Builder.php b/src/MetaModels/DcGeneral/Dca/Builder/Builder.php
index <HASH>..<HASH> 100644
--- a/src/MetaModels/DcGeneral/Dca/Builder/Builder.php
+++ b/src/MetaModels/DcGeneral/Dca/Builder/Builder.php
@@ -1451,10 +1451,14 @@ class Builder
foreach ($inputScreen->getLegends() as $legendName => $legend) {
$paletteLegend = new Legend($legendName);
- $paletteLegend->setInitialVisibility((bool) $legend['visible']);
+ $paletteLegend->setInitialVisibility(isset($legend['visible']) && (bool) $legend['visible']);
$palette->addLegend($paletteLegend);
- $this->translator->setValue($legendName . '_legend', $legend['name'], $container->getName());
+ $this->translator->setValue(
+ $legendName . '_legend',
+ isset($legend['name']) ? $legend['name'] : '',
+ $container->getName()
+ );
foreach ($legend['properties'] as $propertyName) {
$property = new Property($propertyName);
|
Fix some notices in Builder class.
|
diff --git a/src/Domain/Model/ValueObject/StringValueObject.php b/src/Domain/Model/ValueObject/StringValueObject.php
index <HASH>..<HASH> 100644
--- a/src/Domain/Model/ValueObject/StringValueObject.php
+++ b/src/Domain/Model/ValueObject/StringValueObject.php
@@ -34,4 +34,9 @@ abstract class StringValueObject implements ValueObject
{
return new static($value);
}
+
+ public function __toString(): string
+ {
+ return $this->value;
+ }
}
|
Added _toString to StringValueObject for generic use
|
diff --git a/pyvista/utilities/geometric_objects.py b/pyvista/utilities/geometric_objects.py
index <HASH>..<HASH> 100644
--- a/pyvista/utilities/geometric_objects.py
+++ b/pyvista/utilities/geometric_objects.py
@@ -544,7 +544,6 @@ def Disc(center=(0.,0.,0.), inner=0.25, outer=0.5, normal=(0,0,1), r_res=1,
np.clip(np.dot(normal, default_normal), -1, 1)))
transform = vtk.vtkTransform()
- transform.Translate(-center)
transform.RotateWXYZ(angle, axis)
transform.Translate(center)
diff --git a/tests/test_geometric_objects.py b/tests/test_geometric_objects.py
index <HASH>..<HASH> 100644
--- a/tests/test_geometric_objects.py
+++ b/tests/test_geometric_objects.py
@@ -96,6 +96,13 @@ def test_disc():
normals = geom.compute_normals()['Normals']
assert np.allclose(np.dot(normals, unit_normal), 1)
+ center = (1.2, 3.4, 5.6)
+ geom = pyvista.Disc(center=center)
+
+ assert np.allclose(
+ geom.bounds, pyvista.Disc().bounds + np.array([1.2, 1.2, 3.4, 3.4, 5.6, 5.6])
+ )
+
# def test_supertoroid():
# geom = pyvista.SuperToroid()
|
:bug: fix #<I> (#<I>)
|
diff --git a/tests/test_baseapi.py b/tests/test_baseapi.py
index <HASH>..<HASH> 100644
--- a/tests/test_baseapi.py
+++ b/tests/test_baseapi.py
@@ -366,6 +366,25 @@ class TesteAPIQuery(object):
httpretty.disable()
httpretty.reset()
+ def test_query_with_post_body(self, baseapi):
+ httpretty.reset()
+ httpretty.enable()
+ query = '["certname", "=", "node1"]'
+ stub_request('http://localhost:8080/pdb/query/v4/nodes',
+ method=httpretty.POST)
+ baseapi._query('nodes',
+ query=query,
+ count_by=1,
+ request_method='POST',
+ post_as_body=True)
+ last_request = httpretty.last_request()
+ assert last_request.querystring == {}
+ assert last_request.headers['Content-Type'] == 'application/json'
+ assert last_request.method == httpretty.POST
+ assert last_request.body == json.dumps({'query': query, 'count_by': 1})
+ httpretty.disable()
+ httpretty.reset()
+
class TestAPIMethods(object):
def test_metric(self, baseapi):
|
tests/test_baseapi.py: test POST w/ query in body
When a POST request is sent with the query in the body,
instead of as a querystring, then:
- the querystring should be empty
- the body be the JSON encoded dictionary with the query and
other specifiers
- the Content-Type should be 'application/json'
|
diff --git a/salt/cloud/clouds/lxc.py b/salt/cloud/clouds/lxc.py
index <HASH>..<HASH> 100644
--- a/salt/cloud/clouds/lxc.py
+++ b/salt/cloud/clouds/lxc.py
@@ -423,8 +423,7 @@ def create(vm_, call=None):
kwarg['host'] = prov['target']
cret = _runner().cmd('lxc.cloud_init', [vm_['name']], kwarg=kwarg)
ret['runner_return'] = cret
- if cret['result']:
- ret['result'] = False
+ ret['result'] = cret['result']
if not ret['result']:
ret['Error'] = 'Error while creating {0},'.format(vm_['name'])
return ret
|
Return correct result when creating cloud LXC container
At the end of call chain lxc.init returns boolean result, exactly what
we need and not vice verse.
|
diff --git a/br/pkg/pdutil/pd_serial_test.go b/br/pkg/pdutil/pd_serial_test.go
index <HASH>..<HASH> 100644
--- a/br/pkg/pdutil/pd_serial_test.go
+++ b/br/pkg/pdutil/pd_serial_test.go
@@ -35,6 +35,8 @@ func TestScheduler(t *testing.T) {
}
schedulerPauseCh := make(chan struct{})
pdController := &PdController{addrs: []string{"", ""}, schedulerPauseCh: schedulerPauseCh}
+ // As pdController.Client is nil, (*pdController).Close() can not be called directly.
+ defer close(schedulerPauseCh)
_, err := pdController.pauseSchedulersAndConfigWith(ctx, []string{scheduler}, nil, mock)
require.EqualError(t, err, "failed")
@@ -70,9 +72,7 @@ func TestScheduler(t *testing.T) {
_, err = pdController.pauseSchedulersAndConfigWith(ctx, []string{scheduler}, cfg, mock)
require.NoError(t, err)
- go func() {
- <-schedulerPauseCh
- }()
+ // pauseSchedulersAndConfigWith will wait on chan schedulerPauseCh
err = pdController.resumeSchedulerWith(ctx, []string{scheduler}, mock)
require.NoError(t, err)
|
br: fix leak in pdutil.TestScheduler (#<I>)
|
diff --git a/vault/audit.go b/vault/audit.go
index <HASH>..<HASH> 100644
--- a/vault/audit.go
+++ b/vault/audit.go
@@ -259,7 +259,7 @@ func (c *Core) loadAudits(ctx context.Context) error {
entry.namespace = ns
}
- if !needPersist {
+ if !needPersist || c.perfStandby {
return nil
}
|
perf-standby: Fix audit table upgrade on standbys (#<I>)
|
diff --git a/src/test/com/mongodb/JavaClientTest.java b/src/test/com/mongodb/JavaClientTest.java
index <HASH>..<HASH> 100644
--- a/src/test/com/mongodb/JavaClientTest.java
+++ b/src/test/com/mongodb/JavaClientTest.java
@@ -492,7 +492,7 @@ public class JavaClientTest extends TestCase {
@Test
@SuppressWarnings("deprecation")
public void testMapReduceInlineSecondary() throws Exception {
- Mongo mongo = new Mongo(Arrays.asList(new ServerAddress("127.0.0.1"), new ServerAddress("127.0.0.1", 27020)));
+ Mongo mongo = new Mongo(Arrays.asList(new ServerAddress("127.0.0.1", 27017), new ServerAddress("127.0.0.1", 27018)));
if (isStandalone(mongo)) {
return;
|
using sane ports for the replica set test
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ with open("README.md") as infile:
setup(
name='halo',
packages=find_packages(exclude=('tests', 'examples')),
- version='0.0.22',
+ version='0.0.23',
license='MIT',
description='Beautiful terminal spinners in Python',
long_description=long_description,
|
Version: Bumped to <I>
|
diff --git a/pygtkhelpers/objectlist.py b/pygtkhelpers/objectlist.py
index <HASH>..<HASH> 100644
--- a/pygtkhelpers/objectlist.py
+++ b/pygtkhelpers/objectlist.py
@@ -24,6 +24,7 @@ class Cell(object):
cell.set_property('text', self.format_data(data))
def make_viewcell(self):
+ #XXX: extend to more types
return gtk.CellRendererText()
class Column(object):
@@ -41,9 +42,9 @@ class Column(object):
def make_viewcolumn(self):
col = gtk.TreeViewColumn(self.title)
- #XXX: extend to more types
for cell in self.cells:
view_cell = cell.make_viewcell()
+ #XXX: better controll over packing
col.pack_start(view_cell)
col.set_cell_data_func(view_cell, cell._data_func)
return col
|
shuffle some todo comments
|
diff --git a/indices/clearCache.go b/indices/clearCache.go
index <HASH>..<HASH> 100644
--- a/indices/clearCache.go
+++ b/indices/clearCache.go
@@ -8,6 +8,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
+
package indices
import (
diff --git a/indices/snapshot.go b/indices/snapshot.go
index <HASH>..<HASH> 100644
--- a/indices/snapshot.go
+++ b/indices/snapshot.go
@@ -8,6 +8,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
+
package indices
import (
diff --git a/indices/status.go b/indices/status.go
index <HASH>..<HASH> 100644
--- a/indices/status.go
+++ b/indices/status.go
@@ -8,6 +8,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
+
package indices
import (
|
make license not mess up godoc (put space before package decl)
|
diff --git a/tests/dummy/mirage/fixtures/view.js b/tests/dummy/mirage/fixtures/view.js
index <HASH>..<HASH> 100644
--- a/tests/dummy/mirage/fixtures/view.js
+++ b/tests/dummy/mirage/fixtures/view.js
@@ -985,7 +985,7 @@ export default [
{
id: 'conditional-prop-select-form',
label: 'Conditional With Select',
- modelIds: ['conditional-properties'],
+ modelIds: ['conditions', 'conditional-properties'],
view: {
version: '1.0',
type: 'form',
|
Add additional valid model for conditionals view
|
diff --git a/telethon/tl/custom/conversation.py b/telethon/tl/custom/conversation.py
index <HASH>..<HASH> 100644
--- a/telethon/tl/custom/conversation.py
+++ b/telethon/tl/custom/conversation.py
@@ -333,6 +333,12 @@ class Conversation(ChatGetter):
if message.chat_id != self.chat_id or message.out:
return
+ # We have to update our incoming messages with the new edit date
+ for i, m in enumerate(self._incoming):
+ if m.id == message.id:
+ self._incoming[i] = message
+ break
+
for msg_id, future in list(self._pending_edits.items()):
if msg_id < message.id:
edit_ts = message.edit_date.timestamp()
|
Fix handling of early edits in Conversation
The incoming messages were never updated, so of course their
edit_date wasn't either. This would cause the library to be
stuck until it timed out, because the event had already
arrived before we waited for it. As an example:
await conv.send_message('foo')
await sleep(1) # bot has plenty of time to respond+edit
await conv.get_edit()
|
diff --git a/pycbc/filter/zpk.py b/pycbc/filter/zpk.py
index <HASH>..<HASH> 100644
--- a/pycbc/filter/zpk.py
+++ b/pycbc/filter/zpk.py
@@ -28,22 +28,21 @@ import scipy.signal
from pycbc.types import TimeSeries
def filter_zpk(timeseries, z, p, k):
- """Return a new timeseries that is filter with zpk (zeros, poles, gain)
- parameters.
+ """Return a new timeseries that was filtered with a zero-pole-gain filter.
Parameters
----------
timeseries: TimeSeries
The time series to be filtered.
z: array
- Array of zeros to include in zpk filter design, eg. 3 zeroes at 1Hz
- would be array([1., 1., 1.])
+ Array of zeros to include in zero-pole-gain filter design.
+ In units of Hz.
p: array
- Array of poles to include in zpk filter design, eg. 3 poles at 100Hz
- would be array([-100., -100., -100.])
+ Array of poles to include in zero-pole-gain filter design.
+ In units of Hz.
k: float
- Gain to include in zpk filter design. This gain is a contast
- multiplied to the transfer function.
+ Gain to include in zero-pole-gain filter design. This gain is a
+ constant multiplied to the transfer function.
Returns
-------
|
Updated docstring for zpk_filter.
|
diff --git a/lib/parallel_calabash/version.rb b/lib/parallel_calabash/version.rb
index <HASH>..<HASH> 100644
--- a/lib/parallel_calabash/version.rb
+++ b/lib/parallel_calabash/version.rb
@@ -1,3 +1,3 @@
module ParallelCalabash
- VERSION = "0.0.4"
+ VERSION = "0.0.5"
end
|
bumping up version to <I>
|
diff --git a/spec/faraday/adapter/net_http_persistent_spec.rb b/spec/faraday/adapter/net_http_persistent_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/faraday/adapter/net_http_persistent_spec.rb
+++ b/spec/faraday/adapter/net_http_persistent_spec.rb
@@ -42,21 +42,13 @@ RSpec.describe Faraday::Adapter::NetHttpPersistent do
end
context 'min_version' do
- let(:conn_options) do
- {
- headers: { 'X-Faraday-Adapter' => adapter },
- ssl: {
- min_version: :TLS1_2
- }
- }
- end
-
it 'allows to set min_version in SSL settings' do
url = URI('https://example.com')
adapter = described_class.new(nil)
http = adapter.send(:net_http_connection, url: url, request: {})
+ adapter.send(:configure_ssl, http, { min_version: :TLS1_2 })
# `min_version` is only present in net_http_persistent >= 3.1 (UNRELEASED)
expect(http.min_version).to eq(:TLS1_2) if http.respond_to?(:min_version)
|
Fixes test not working with Net::HTTP::Persistent <I>
|
diff --git a/src/Model/Table/PermissionsTable.php b/src/Model/Table/PermissionsTable.php
index <HASH>..<HASH> 100644
--- a/src/Model/Table/PermissionsTable.php
+++ b/src/Model/Table/PermissionsTable.php
@@ -106,7 +106,7 @@ class PermissionsTable extends Table
}
/**
- * Retrieves current lead view permission for specified user.
+ * Retrieves view permission for specified user.
*
* @param string $modelName Model name
* @param string $foreignKey Foreign key
|
Adjust docblock (task #<I>)
|
diff --git a/app.go b/app.go
index <HASH>..<HASH> 100644
--- a/app.go
+++ b/app.go
@@ -42,6 +42,8 @@ type App struct {
ArgsUsage string
// Version of the program
Version string
+ // Description of the program
+ Description string
// List of commands to execute
Commands []Command
// List of flags to parse
diff --git a/help.go b/help.go
index <HASH>..<HASH> 100644
--- a/help.go
+++ b/help.go
@@ -20,7 +20,10 @@ USAGE:
{{if .Version}}{{if not .HideVersion}}
VERSION:
{{.Version}}
- {{end}}{{end}}{{if len .Authors}}
+ {{end}}{{end}}{{if .Description}}
+DESCRIPTION:
+ {{.Description}}
+{{end}}{{if len .Authors}}
AUTHOR(S):
{{range .Authors}}{{.}}{{end}}
{{end}}{{if .VisibleCommands}}
|
app: Add App.Description
So you can describe what the application is for without requiring
users to drill down into a particular command.
|
diff --git a/thrift/transport.go b/thrift/transport.go
index <HASH>..<HASH> 100644
--- a/thrift/transport.go
+++ b/thrift/transport.go
@@ -34,6 +34,7 @@ type readWriterTransport struct {
io.Reader
readBuf [1]byte
writeBuf [1]byte
+ strBuf []byte
}
var errNoBytesRead = errors.New("no bytes read")
@@ -82,7 +83,22 @@ func (t *readWriterTransport) WriteByte(b byte) error {
}
func (t *readWriterTransport) WriteString(s string) (int, error) {
- return io.WriteString(t.Writer, s)
+ // TODO switch to io.StringWriter once we don't need to support < 1.12
+ type stringWriter interface{ WriteString(string) (int, error) }
+
+ if sw, ok := t.Writer.(stringWriter); ok {
+ return sw.WriteString(s)
+ }
+
+ // This path frequently taken since thrift.TBinaryProtocol calls
+ // WriteString a lot, but fragmentingWriter does not implement WriteString;
+ // furthermore it is difficult to add a dual WriteString path to
+ // fragmentingWriter, since hash checksumming does not accept strings.
+ //
+ // Without this, io.WriteString ends up allocating every time.
+ b := append(t.strBuf[:0], s...)
+ t.strBuf = b[:0]
+ return t.Writer.Write(b)
}
// RemainingBytes returns the max number of bytes (same as Thrift's StreamTransport) as we
|
Eliminate []byte(string) allocation under thrift transport
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.