diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/toh5.py b/toh5.py
index <HASH>..<HASH> 100644
--- a/toh5.py
+++ b/toh5.py
@@ -62,10 +62,10 @@ def convert_chain(
maxshape=(None,),
dtype=np.float64,
chunks=(chunksize,),
- compression='lzf',
+ compression='gzip',
shuffle=True)
- dset.attr.create('unit', u)
+ dset.attrs.create('unit', u.encode('utf8'))
with open(txtfile, 'r') as f:
for chunk in filechunk(f, chunksize):
|
Change compression option to gzip (the standard). Updated attribute
syntax to h5py <I>.
lzf compression is better than gzip, but is h5py specific, which we
really don't want.
|
diff --git a/tests/jenkins.py b/tests/jenkins.py
index <HASH>..<HASH> 100644
--- a/tests/jenkins.py
+++ b/tests/jenkins.py
@@ -75,7 +75,18 @@ def run(platform, provider, commit, clean):
stream_stds=True
)
proc.poll_and_read_until_finish()
- proc.communicate()
+ stdout, stderr = proc.communicate()
+ if stdout:
+ print '--------- recorded stdout ----------'
+ print(stdout)
+ print '------------------------------------'
+
+ if stderr:
+ print '--------- recorded stderr ----------'
+ print(stderr)
+ print '------------------------------------'
+
+
if proc.returncode > 0:
print('Failed to bootstrap VM. Exit code: {0}'.format(proc.returncode))
sys.stdout.flush()
|
Add debug print to check if communicate is doin' the right thing.
|
diff --git a/functional_tests/test_services.py b/functional_tests/test_services.py
index <HASH>..<HASH> 100644
--- a/functional_tests/test_services.py
+++ b/functional_tests/test_services.py
@@ -102,6 +102,16 @@ class BuzzFunctionalTest(unittest.TestCase):
self.assertEquals('111062888259659218284', person['id'])
self.assertEquals('http://www.google.com/profiles/googlebuzz', person['profileUrl'])
+ def test_can_get_user_profile_using_numeric_identifier(self):
+ buzz = build('buzz', 'v1')
+ person = buzz.people().get(userId='108242092577082601423').execute()
+
+ self.assertTrue(person is not None)
+ self.assertEquals('buzz#person', person['kind'])
+ self.assertEquals('Test Account', person['displayName'])
+ self.assertEquals('108242092577082601423', person['id'])
+ self.assertEquals('http://www.google.com/profiles/108242092577082601423', person['profileUrl'])
+
def test_can_get_followees_of_user(self):
buzz = build('buzz', 'v1')
expected_followees = 30
|
Added a test for getting profiles via numeric identifiers
|
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
index <HASH>..<HASH> 100644
--- a/src/Symfony/Component/HttpKernel/Kernel.php
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -56,12 +56,12 @@ abstract class Kernel implements KernelInterface
protected $startTime;
protected $classes;
- const VERSION = '2.0.19';
- const VERSION_ID = '20019';
+ const VERSION = '2.0.20-DEV';
+ const VERSION_ID = '20020';
const MAJOR_VERSION = '2';
const MINOR_VERSION = '0';
- const RELEASE_VERSION = '19';
- const EXTRA_VERSION = '';
+ const RELEASE_VERSION = '20';
+ const EXTRA_VERSION = 'DEV';
/**
* Constructor.
|
bumped Symfony version to <I>-DEV
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -27,13 +27,3 @@ googleSearch(['agua', 'lluvia', 'rajoy'], {year: 2016, month: 1, date: 12})
.catch(reason => {
console.log(reason)
})
-
-
-
-//elpais('2016', '01', '01', 'm')
-// .then(content => { console.log(content) })
-
-//elpais2('http://internacional.elpais.com/internacional/2016/01/01/actualidad/1451637621_839243.html')
-// .then(content => {
-//console.log(content)
-// })
|
Enhance test script. Delete unnecesary lines
|
diff --git a/blimpy/file_wrapper.py b/blimpy/file_wrapper.py
index <HASH>..<HASH> 100644
--- a/blimpy/file_wrapper.py
+++ b/blimpy/file_wrapper.py
@@ -452,7 +452,7 @@ class FilReader(Reader):
self.n_pols_in_file = 1 #Placeholder for future development.
self._n_bytes = self.header['nbits'] / 8 #number of bytes per digit.
self._d_type = self._setup_dtype()
- self._get_n_ints_in_file()
+ self._setup_n_ints_in_file()
self.file_shape = (self.n_ints_in_file,self.n_beams_in_file,self.n_channels_in_file)
if self.header['foff'] < 0:
@@ -515,7 +515,7 @@ class FilReader(Reader):
else:
raise IOError("Need a file to open, please give me one!")
- def _get_n_ints_in_file(self):
+ def _setup_n_ints_in_file(self):
n_bytes = self._n_bytes
n_chans = self.n_channels_in_file
|
Renamed _get_n_ints_in_file to _setup_n_ints_in_file for consistency
Other methods such as _setup_freqs and _setup_chans
|
diff --git a/lib/client.js b/lib/client.js
index <HASH>..<HASH> 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -7,8 +7,8 @@ var net = require('net'),
errors = require('./errors'),
Binary = require('binary'),
protocol = require('./protocol'),
- Zookeeper = require('./zookeeper');
-
+ zk = require('./zookeeper'),
+ Zookeeper = zk.Zookeeper;
/**
* Communicates with kafka brokers
* Uses zookeeper to discover all the kafka brokers to connect to
|
Adding highLevel Consumers and Producers
|
diff --git a/cmd/juju/cloud/updatecredential.go b/cmd/juju/cloud/updatecredential.go
index <HASH>..<HASH> 100644
--- a/cmd/juju/cloud/updatecredential.go
+++ b/cmd/juju/cloud/updatecredential.go
@@ -19,18 +19,18 @@ var usageUpdateCredentialSummary = `
Updates a controller credential for a cloud.`[1:]
var usageUpdateCredentialDetails = `
-Controller credentials are used for model operations and manipulations.
+Cloud credentials for controller are used for model operations and manipulations.
Since it is common to have long-running models, it is also common to
-have cloud credentials become invalid during models' lifetime.
-When this happens, a user must update the controller credential that
-a model was created with to the new and valid details.
+have these cloud credentials become invalid during models' lifetime.
+When this happens, a user must update the cloud credential that
+a model was created with to the new and valid details on controller.
This command allows to update an existing, already-stored, named,
cloud-specific controller credential.
NOTE:
-This is the only command that will allow you to manipulate
-a controller credential.
+This is the only command that will allow you to manipulate cloud
+credential for a controller.
All other credential related commands, such as
` + "`add-credential`" + `, ` + "`remove-credential`" + ` and ` + "`credentials`" + `
deal with credentials stored locally on the client not on the controller.
|
"controller credential" change to "cloud credential for controller"
|
diff --git a/ssllabs-scan.go b/ssllabs-scan.go
index <HASH>..<HASH> 100644
--- a/ssllabs-scan.go
+++ b/ssllabs-scan.go
@@ -270,7 +270,7 @@ func invokeGetRepeatedly(url string) (*http.Response, []byte, error) {
resp, err := httpClient.Do(req)
if err == nil {
if logLevel >= LOG_DEBUG {
- log.Printf("[DEBUG] Response status code (%v): %v", resp.StatusCode, reqId)
+ log.Printf("[DEBUG] Response status code (%v): %v", reqId, resp.StatusCode)
}
// Adjust maximum concurrent requests.
|
Fix the response status code log message.
|
diff --git a/main.go b/main.go
index <HASH>..<HASH> 100644
--- a/main.go
+++ b/main.go
@@ -8,6 +8,7 @@ import (
"io/ioutil"
"net/http"
"os"
+ "path"
"strings"
"github.com/cheekybits/genny/parse"
@@ -62,6 +63,11 @@ func main() {
var outWriter io.Writer
if len(*out) > 0 {
+ err := os.MkdirAll(path.Dir(*out), 0755)
+ if err != nil {
+ fatal(exitcodeDestFileFailed, err)
+ }
+
outFile, err := os.Create(*out)
if err != nil {
fatal(exitcodeDestFileFailed, err)
|
Adding the creation of output dirs
|
diff --git a/src/main/java/org/mariadb/jdbc/internal/util/Utils.java b/src/main/java/org/mariadb/jdbc/internal/util/Utils.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/mariadb/jdbc/internal/util/Utils.java
+++ b/src/main/java/org/mariadb/jdbc/internal/util/Utils.java
@@ -665,7 +665,7 @@ public class Utils {
int pos = offset;
int posHexa = 0;
- while (pos < dataLength) {
+ while (pos < dataLength + offset) {
int byteValue = bytes[pos] & 0xFF;
outputBuilder.append(hexArray[byteValue >>> 4])
.append(hexArray[byteValue & 0x0F])
|
[misc] correcting debug output when having offset
|
diff --git a/src/Post_Command.php b/src/Post_Command.php
index <HASH>..<HASH> 100644
--- a/src/Post_Command.php
+++ b/src/Post_Command.php
@@ -143,6 +143,10 @@ class Post_Command extends \WP_CLI\CommandWithDBObject {
* # Create post with content from given file
* $ wp post create ./post-content.txt --post_category=201,345 --post_title='Post from file'
* Success: Created post 1922.
+ *
+ * # Create a post with multiple meta values.
+ * $ wp post create --post_title='A post' --post_content='Just a small post.' --meta_input='{"key1":"value1","key2":"value2"}
+ * Success: Created post 1923.
*/
public function create( $args, $assoc_args ) {
if ( ! empty( $args[0] ) ) {
@@ -271,6 +275,10 @@ class Post_Command extends \WP_CLI\CommandWithDBObject {
*
* $ wp post update 123 --post_name=something --post_status=draft
* Success: Updated post 123.
+ *
+ * # Update a post with multiple meta values.
+ * $ wp post update 123 --meta_input='{"key1":"value1","key2":"value2"}
+ * Success: Updated post 123.
*/
public function update( $args, $assoc_args ) {
|
Add examples to dcoblocks.
|
diff --git a/bin/LifeCyclePlots.py b/bin/LifeCyclePlots.py
index <HASH>..<HASH> 100755
--- a/bin/LifeCyclePlots.py
+++ b/bin/LifeCyclePlots.py
@@ -11,12 +11,13 @@ def get_command_line_options(executable_name, arguments):
parser = OptionParser(usage="%s options" % executable_name)
parser.add_option("-i", "--in", type="string", dest="input", help="Input DB File")
parser.add_option("-o", "--out", type="string", dest="output", help="Output Root File")
+ parser.add_option("-p", "--print", type="string", dest="print_format", help="Print histograms in format")
(options, args) = parser.parse_args()
- if not (options.input and options.output):
+ if not options.input:
parser.print_help()
- parser.error("You need to provide following options, --in=input.sql, --out=plot.root")
+ parser.error("You need to provide following options, --in=input.sql (mandatory), --out=plot.root (optional), --print <format> (optional)")
return options
@@ -106,4 +107,6 @@ if __name__ == "__main__":
histo_manager.update_histos(row)
histo_manager.draw_histos()
- histo_manager.save_histos_as(format="png")
+
+ if options.print_format:
+ histo_manager.save_histos_as(format=options.print_format)
|
Added print options and remove root file from mandatory options.
|
diff --git a/test/pbt_test.rb b/test/pbt_test.rb
index <HASH>..<HASH> 100644
--- a/test/pbt_test.rb
+++ b/test/pbt_test.rb
@@ -112,6 +112,12 @@ class PbtTest < ActiveSupport::TestCase
bob_to_prof.must_respond_to(:last )
bob_to_prof.must_be_kind_of(ActiveRecord::Associations::CollectionProxy)
end
+
+ it "AsCollectionProxy returns empty FakedCollection when handed unrelated instances" do
+ fc = PolyBelongsTo::Pbt::AsCollectionProxy[Alpha.new, Capa]
+ fc.must_be_kind_of(PolyBelongsTo::FakedCollection)
+ fc.must_be :empty?
+ end
end
end
|
Additional test for FakedCollection.
|
diff --git a/libstempo/toasim.py b/libstempo/toasim.py
index <HASH>..<HASH> 100644
--- a/libstempo/toasim.py
+++ b/libstempo/toasim.py
@@ -359,7 +359,7 @@ def add_line(psr,f,A,offset=0.5):
psr.stoas[:] += sine / day
-def add_glitch(psr, epoch, amplitude):
+def add_glitch(psr, epoch, amp):
"""
Like pulsar term BWM event, but now differently parameterized: just an
amplitude (not log-amp) parameter, and an epoch. [source: piccard]
|
adding glitch signal to toasim
|
diff --git a/tests/regressors.py b/tests/regressors.py
index <HASH>..<HASH> 100644
--- a/tests/regressors.py
+++ b/tests/regressors.py
@@ -72,6 +72,8 @@ def categorical_ensembling_regression(model_name=None):
lower_bound = -16
if model_name == 'LGBMRegressor':
lower_bound = -4.95
+ if model_name == 'GradientBoostingRegressor':
+ lower_bound = -4.2
assert lower_bound < test_score < -2.8
@@ -227,6 +229,8 @@ def feature_learning_getting_single_predictions_regression(model_name=None):
lower_bound = -4.95
if model_name == 'XGBRegressor':
lower_bound = -3.3
+ if model_name == 'GradientBoostingRegressor':
+ lower_bound = -3.75
assert lower_bound < first_score < -2.8
|
adjusts test bounds for gradientboosting for higher learning rate
|
diff --git a/client/fingerprint/memory.go b/client/fingerprint/memory.go
index <HASH>..<HASH> 100644
--- a/client/fingerprint/memory.go
+++ b/client/fingerprint/memory.go
@@ -35,7 +35,7 @@ func (f *MemoryFingerprint) Fingerprint(cfg *config.Config, node *structs.Node)
if node.Resources == nil {
node.Resources = &structs.Resources{}
}
- node.Resources.MemoryMB = int(memInfo.Total)
+ node.Resources.MemoryMB = int(memInfo.Total / 1024 / 1024)
}
return true, nil
diff --git a/client/fingerprint/memory_test.go b/client/fingerprint/memory_test.go
index <HASH>..<HASH> 100644
--- a/client/fingerprint/memory_test.go
+++ b/client/fingerprint/memory_test.go
@@ -20,8 +20,10 @@ func TestMemoryFingerprint(t *testing.T) {
t.Fatalf("should apply")
}
- if node.Attributes["memory.totalbytes"] == "" {
- t.Fatalf("Missing memory.totalbyes")
+ assertNodeAttributeContains(t, node, "memory.totalbytes")
+
+ if node.Resources == nil {
+ t.Fatalf("Node Resources was nil")
}
}
|
convert to MB for MemoryMB, and update test
|
diff --git a/app/assets/javascripts/peoplefinder/photo_upload.js b/app/assets/javascripts/peoplefinder/photo_upload.js
index <HASH>..<HASH> 100644
--- a/app/assets/javascripts/peoplefinder/photo_upload.js
+++ b/app/assets/javascripts/peoplefinder/photo_upload.js
@@ -239,5 +239,19 @@ $(function (){
var photoBlocks = $('.person-photo');
if(photoBlocks.length > 0){
_.each(photoBlocks, PhotoUpload.enhance);
+
+ var saveBtn = $('.save-cancel-actions input[name="commit"]'),
+ cropButton = PhotoUpload.findElements(photoBlocks).$cropButton,
+ editForm = $('form.edit_person');
+
+ saveBtn.click(function(e){
+ e.preventDefault();
+ if(cropButton.is(':visible')){
+ cropButton.trigger('click');
+ editForm.submit();
+ } else {
+ editForm.submit();
+ }
+ });
}
});
|
crop image on save if not already
|
diff --git a/base.php b/base.php
index <HASH>..<HASH> 100644
--- a/base.php
+++ b/base.php
@@ -1487,7 +1487,9 @@ class Base extends Prefab implements ArrayAccess {
$val=ltrim($val);
if (preg_match('/^\w+$/i',$val) && defined($val))
return constant($val);
- return preg_replace('/\\\\\h*(\r?\n)/','\1',$val);
+ return preg_replace(
+ array('/\\\\"/','/\\\\\h*(\r?\n)/'),
+ array('"','\1'),$val);
},
// Mark quoted strings with 0x00 whitespace
str_getcsv(preg_replace('/(?<!\\\\)(")(.*?)\1/',
|
Bug fix: Double quotes in lexicon files (Issue #<I>)
|
diff --git a/src/Elfiggo/Brobdingnagian/Detector/NumberOfInterfaces.php b/src/Elfiggo/Brobdingnagian/Detector/NumberOfInterfaces.php
index <HASH>..<HASH> 100644
--- a/src/Elfiggo/Brobdingnagian/Detector/NumberOfInterfaces.php
+++ b/src/Elfiggo/Brobdingnagian/Detector/NumberOfInterfaces.php
@@ -6,12 +6,27 @@ use Elfiggo\Brobdingnagian\Param\Params;
use Elfiggo\Brobdingnagian\Report\Reporter;
use ReflectionClass;
+/**
+ * Class NumberOfInterfaces
+ * @package Elfiggo\Brobdingnagian\Detector
+ */
class NumberOfInterfaces implements Detection
{
+
+ /**
+ * @param ReflectionClass $sus
+ * @param Params $param
+ * @param Reporter $reporter
+ */
public function check(ReflectionClass $sus, Params $param, Reporter $reporter)
{
if (count($sus->getInterfaces()) > $param->getNumberOfInterfaces()) {
- $reporter->act($sus, self::class, "{$sus->getName()} has too many interfaces (" . count($sus->getInterfaces()) .')', 'Too many interfaces');
+ $reporter->act(
+ $sus,
+ self::class,
+ "{$sus->getName()} has too many interfaces (" . count($sus->getInterfaces()) .')',
+ 'Too many interfaces'
+ );
}
}
}
|
Added Class docbloc and reduced line length
|
diff --git a/lib/transports/websocket.js b/lib/transports/websocket.js
index <HASH>..<HASH> 100644
--- a/lib/transports/websocket.js
+++ b/lib/transports/websocket.js
@@ -51,9 +51,17 @@
*/
WS.prototype.open = function () {
- var Socket = 'MozWebSocket' in window ? MozWebSocket : WebSocket
- , query = io.util.query(this.socket.options.query)
- , self = this;
+ var query = io.util.query(this.socket.options.query)
+ , self = this
+ , Socket
+
+ // if node
+ Socket = require('websocket-client').WebSocket;
+ // end node
+
+ if (!Socket) {
+ Socket = window.MozWebSocket || window.WebSocket;
+ }
this.websocket = new Socket(this.prepareUrl() + query);
@@ -143,6 +151,9 @@
*/
WS.check = function () {
+ // if node
+ return true;
+ // end node
return ('WebSocket' in window && !('__addTask' in WebSocket))
|| 'MozWebSocket' in window;
};
|
Fixed support for Node.JS running `socket.io-client`.
|
diff --git a/plugins/org.eclipse.xtext.common.types/src/org/eclipse/xtext/common/types/util/TypeConformanceComputer.java b/plugins/org.eclipse.xtext.common.types/src/org/eclipse/xtext/common/types/util/TypeConformanceComputer.java
index <HASH>..<HASH> 100644
--- a/plugins/org.eclipse.xtext.common.types/src/org/eclipse/xtext/common/types/util/TypeConformanceComputer.java
+++ b/plugins/org.eclipse.xtext.common.types/src/org/eclipse/xtext/common/types/util/TypeConformanceComputer.java
@@ -310,17 +310,10 @@ public class TypeConformanceComputer {
protected boolean areArgumentsAssignableFrom(JvmParameterizedTypeReference left, JvmParameterizedTypeReference right) {
// raw type
- if (left.getArguments().size() == 0) {
+ if (left.getArguments().size() == 0 || right.getArguments().size() == 0) {
return true;
}
if (left.getArguments().size() != right.getArguments().size()) {
- if (right.getArguments().size() == 0) {
- for(JvmTypeReference argument: left.getArguments()) {
- if (!isUnconstrainedWildcard(argument))
- return false;
- }
- return true;
- }
return false;
}
|
[common.types] Reverted changes in type conformance computer that broke raw type processing.
|
diff --git a/classes/Pods.php b/classes/Pods.php
index <HASH>..<HASH> 100644
--- a/classes/Pods.php
+++ b/classes/Pods.php
@@ -4182,7 +4182,7 @@ class Pods implements Iterator {
&& pods_shortcode_allow_evaluate_tags()
&& ! $this->fields( $field_name )
) {
- $value = pods_evaluate_tag( implode( ',', $tag ), true );
+ $value = pods_evaluate_tag( implode( ',', $tag ) );
}
if ( isset( $tag[2] ) && ! empty( $tag[2] ) ) {
|
Do not sanitize, this method is used for display
|
diff --git a/devices/tuya.js b/devices/tuya.js
index <HASH>..<HASH> 100644
--- a/devices/tuya.js
+++ b/devices/tuya.js
@@ -1687,6 +1687,7 @@ module.exports = [
{modelID: 'TS0601', manufacturerName: '_TZE200_tvrvdj6o'},
{modelID: 'zo2pocs\u0000', manufacturerName: '_TYST11_fzo2pocs'},
{modelID: 'TS0601', manufacturerName: '_TZE200_cf1sl3tj'},
+ {modelID: 'TS0601', manufacturerName: '_TZE200_b2u1drdv'},
// Roller blinds:
{modelID: 'TS0601', manufacturerName: '_TZE200_fctwhugx'},
{modelID: 'TS0601', manufacturerName: '_TZE200_zah67ekd'},
|
Add TZE<I>_b2u1drdv to TS<I>_cover (#<I>)
|
diff --git a/influxdb/client.py b/influxdb/client.py
index <HASH>..<HASH> 100755
--- a/influxdb/client.py
+++ b/influxdb/client.py
@@ -362,13 +362,13 @@ class InfluxDBClient(object):
rsp = self.query("SHOW SERIES", database=database)
print "RSP", rsp.raw
print "RSP", rsp['results']
- return rsp
+ return list(rsp)
def get_list_users(self):
"""
Get the list of users
"""
- return self.query("SHOW USERS")
+ return list(self.query("SHOW USERS"))
def delete_series(self, name, database=None):
database = database or self._database
|
Proposed Fix: expand the ResultSet response by using list() on it.
Other solution is to return the ResultSet instance but then we must adapt all call sites..
To be decided..
|
diff --git a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/ReplicatedMapService.java b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/ReplicatedMapService.java
index <HASH>..<HASH> 100644
--- a/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/ReplicatedMapService.java
+++ b/hazelcast/src/main/java/com/hazelcast/replicatedmap/impl/ReplicatedMapService.java
@@ -84,9 +84,7 @@ public class ReplicatedMapService
@Override
public void reset() {
- for (ReplicatedRecordStore replicatedRecordStore : replicatedStorages.values()) {
- replicatedRecordStore.clear(false, true);
- }
+ // Nothing to do, it is ok for a ReplicatedMap to keep its current state on rejoins
}
@Override
|
Fixed losing ReplicatedMap internal state on re-joining a cluster
|
diff --git a/lib/webrat/core/matchers/have_xpath.rb b/lib/webrat/core/matchers/have_xpath.rb
index <HASH>..<HASH> 100644
--- a/lib/webrat/core/matchers/have_xpath.rb
+++ b/lib/webrat/core/matchers/have_xpath.rb
@@ -15,7 +15,7 @@ module Webrat
matched = matches(stringlike)
if @options[:count]
- matched.size == @options[:count] && (!@block || @block.call(matched))
+ matched.size == @options[:count].to_i && (!@block || @block.call(matched))
else
matched.any? && (!@block || @block.call(matched))
end
diff --git a/spec/public/matchers/have_selector_spec.rb b/spec/public/matchers/have_selector_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/public/matchers/have_selector_spec.rb
+++ b/spec/public/matchers/have_selector_spec.rb
@@ -61,6 +61,10 @@ describe "have_selector" do
@body.should have_selector("li", :count => 4)
}.should raise_error(Spec::Expectations::ExpectationNotMetError)
end
+
+ it "should convert a string to an integer for count" do
+ @body.should have_selector("li", :count => "3")
+ end
end
describe "specifying nested elements" do
|
Forces an integer to fix Issue #<I>
|
diff --git a/gem-maven-plugin/src/main/java/de/saumya/mojo/gem/PackageMojo.java b/gem-maven-plugin/src/main/java/de/saumya/mojo/gem/PackageMojo.java
index <HASH>..<HASH> 100644
--- a/gem-maven-plugin/src/main/java/de/saumya/mojo/gem/PackageMojo.java
+++ b/gem-maven-plugin/src/main/java/de/saumya/mojo/gem/PackageMojo.java
@@ -181,6 +181,7 @@ public class PackageMojo extends AbstractGemMojo {
this.factory.newScriptFromJRubyJar("gem")
.addArg("build", this.gemspec)
.addArg("--backtrace")
+ .addArg("--verbose")
.executeIn(launchDirectory());
File newPom = new File( this.gemspec.getParentFile(), "pom." + this.gemspec.getName() + ".xml");
@@ -391,6 +392,7 @@ public class PackageMojo extends AbstractGemMojo {
this.factory.newScriptFromJRubyJar("gem")
.addArg("build", gemSpec)
.addArg("--backtrace")
+ .addArg("--verbose")
.executeIn(gemDir);
if ((!localGemspec.exists() || !FileUtils.contentEquals(localGemspec,
|
Pass verbose flag to rubygems command launching
It makes it much easier to troubleshoot errors.
|
diff --git a/tests/test_case.py b/tests/test_case.py
index <HASH>..<HASH> 100644
--- a/tests/test_case.py
+++ b/tests/test_case.py
@@ -5,6 +5,7 @@ import numpy as np
from andes.utils.paths import get_case
+andes.main.config_logger(stream_level=10)
class Test5Bus(unittest.TestCase):
def setUp(self) -> None:
|
Output logs for debugging.
|
diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php
index <HASH>..<HASH> 100644
--- a/lib/Cake/Model/Datasource/DboSource.php
+++ b/lib/Cake/Model/Datasource/DboSource.php
@@ -2917,6 +2917,10 @@ class DboSource extends DataSource {
}
$statement->execute();
$statement->closeCursor();
+
+ if ($this->fullDebug) {
+ $this->logQuery($sql, $value);
+ }
}
return $this->commit();
}
|
Added query logging to DboSource::insertMulti(). Closes #<I>
|
diff --git a/autoit/win.py b/autoit/win.py
index <HASH>..<HASH> 100644
--- a/autoit/win.py
+++ b/autoit/win.py
@@ -381,7 +381,7 @@ def win_menu_select_item(title, *items, **kwargs):
if not (0 < len(items) < 8):
raise ValueError("accepted none item or number of items exceed eight")
f_items = [LPCWSTR(item) for item in items]
- for i in xrange(8 - len(f_items)):
+ for i in range(8 - len(f_items)):
f_items.append(LPCWSTR(""))
ret = AUTO_IT.AU3_WinMenuSelectItem(LPCWSTR(title), LPCWSTR(text),
@@ -400,7 +400,7 @@ def win_menu_select_item_by_handle(handle, *items):
if not (0 < len(items) < 8):
raise ValueError("accepted none item or number of items exceed eight")
f_items = [LPCWSTR(item) for item in items]
- for i in xrange(8 - len(f_items)):
+ for i in range(8 - len(f_items)):
f_items.append(LPCWSTR(""))
ret = AUTO_IT.AU3_WinMenuSelectItemByHandle(HWND(handle), *f_items)
|
change use of xrange to range to be python3 compatible
|
diff --git a/padatious/__init__.py b/padatious/__init__.py
index <HASH>..<HASH> 100644
--- a/padatious/__init__.py
+++ b/padatious/__init__.py
@@ -15,4 +15,4 @@
from .intent_container import IntentContainer
from .match_data import MatchData
-__version__ = '0.4.3' # Also change in setup.py
+__version__ = '0.4.4' # Also change in setup.py
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ with open(join(dirname(abspath(__file__)), 'requirements.txt')) as f:
setup(
name='padatious',
- version='0.4.3', # Also change in padatious/__init__.py
+ version='0.4.4', # Also change in padatious/__init__.py
description='A neural network intent parser',
url='http://github.com/MycroftAI/padatious',
author='Matthew Scholefield',
|
Increment version to <I>
|
diff --git a/src/main/java/gwt/material/design/addins/client/masonry/MaterialMasonry.java b/src/main/java/gwt/material/design/addins/client/masonry/MaterialMasonry.java
index <HASH>..<HASH> 100644
--- a/src/main/java/gwt/material/design/addins/client/masonry/MaterialMasonry.java
+++ b/src/main/java/gwt/material/design/addins/client/masonry/MaterialMasonry.java
@@ -55,7 +55,7 @@ import gwt.material.design.client.ui.MaterialRow;
* @author kevzlou7979
*/
//@formatter:on
-public class MaterialMasonry extends MaterialWidget {
+public class MaterialMasonry extends MaterialRow {
static {
if(MaterialAddins.isDebug()) {
|
Use MaterialRow for MaterialMasonry.
|
diff --git a/library/src/main/java/de/mrapp/android/preference/activity/PreferenceActivity.java b/library/src/main/java/de/mrapp/android/preference/activity/PreferenceActivity.java
index <HASH>..<HASH> 100644
--- a/library/src/main/java/de/mrapp/android/preference/activity/PreferenceActivity.java
+++ b/library/src/main/java/de/mrapp/android/preference/activity/PreferenceActivity.java
@@ -1680,7 +1680,8 @@ public abstract class PreferenceActivity extends AppCompatActivity
@Override
public final void onNavigationAdapterCreated() {
- if (isSplitScreen() && navigationFragment.getNavigationPreferenceCount() > 0) {
+ if (navigationFragment.getNavigationPreferenceCount() > 0 &&
+ (isSplitScreen() || isButtonBarShown())) {
navigationFragment.selectNavigationPreference(0, null);
}
}
|
The first navigation preference is now selected by default, when using the activity as a wizard.
|
diff --git a/lib/specinfra/version.rb b/lib/specinfra/version.rb
index <HASH>..<HASH> 100644
--- a/lib/specinfra/version.rb
+++ b/lib/specinfra/version.rb
@@ -1,3 +1,3 @@
module Specinfra
- VERSION = "2.57.0"
+ VERSION = "2.57.1"
end
|
Bump up version
[skip ci]
|
diff --git a/redis/client.py b/redis/client.py
index <HASH>..<HASH> 100644
--- a/redis/client.py
+++ b/redis/client.py
@@ -1670,8 +1670,8 @@ class Redis(StrictRedis):
RESPONSE_CALLBACKS = dict_merge(
StrictRedis.RESPONSE_CALLBACKS,
{
- 'TTL': lambda r: r != -1 and r or None,
- 'PTTL': lambda r: r != -1 and r or None,
+ 'TTL': lambda r: r >= 0 and r or None,
+ 'PTTL': lambda r: r >= 0 and r or None,
}
)
|
Adjust to changed TTL, PTTL semantics
Redis >= <I> might return -2, this ensures that redis-py just returns
None.
|
diff --git a/extensions/get-the-image.php b/extensions/get-the-image.php
index <HASH>..<HASH> 100644
--- a/extensions/get-the-image.php
+++ b/extensions/get-the-image.php
@@ -16,7 +16,7 @@
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* @package GetTheImage
- * @version 0.8.0
+ * @version 0.8.1 - Alpha
* @author Justin Tadlock <[email protected]>
* @copyright Copyright (c) 2008 - 2012, Justin Tadlock
* @link http://justintadlock.com/archives/2008/05/27/get-the-image-wordpress-plugin
|
Bump to <I> alpha.
|
diff --git a/lib/mbtiles.js b/lib/mbtiles.js
index <HASH>..<HASH> 100644
--- a/lib/mbtiles.js
+++ b/lib/mbtiles.js
@@ -105,7 +105,6 @@ MBTiles.prototype._exists = function(table, callback) {
if (this._schema) {
return callback(null, _(this._schema).include(table));
} else {
- this._schema = [];
this._db.all(
'SELECT name FROM sqlite_master WHERE type IN (?, ?)',
'table',
|
Fix early initialization of _schema attribute.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -74,6 +74,7 @@ setup(
packages=["draco"],
entry_points={"console_scripts": ["draco=draco.cli:main"]},
install_requires=["clyngor"],
+ include_package_data=True,
extras_require={
"test": ["coverage", "pytest", "pytest-cov", "black", "ansunit", "mypy"]
},
|
Copy asp and js files during installation. Fixes #<I>
|
diff --git a/src/Gossamer/Pesedget/Database/DatasourceFactory.php b/src/Gossamer/Pesedget/Database/DatasourceFactory.php
index <HASH>..<HASH> 100644
--- a/src/Gossamer/Pesedget/Database/DatasourceFactory.php
+++ b/src/Gossamer/Pesedget/Database/DatasourceFactory.php
@@ -35,15 +35,15 @@ class DatasourceFactory {
public function getDatasource($sourceName, Logger $logger) {
$datasources = $this->getDatasources();
- if (!array_key_exists($sourceName, $datasources)) {
- // try {
+ if (!array_key_exists($sourceName, $datasources) || !is_object($datasources[$sourceName])) {
+ try {
$ds = $this->buildDatasourceInstance($sourceName, $logger);
$datasources[$sourceName] = $ds;
-// } catch (\Exception $e) {
-// echo $e->getMessage();
-// $logger->addError($sourceName . ' is not a valid datasource');
-// throw new \Exception($sourceName . ' is not a valid datasource', 580);
-// }
+ } catch (\Exception $e) {
+ echo $e->getMessage();
+ $logger->addError($sourceName . ' is not a valid datasource');
+ throw new \Exception($sourceName . ' is not a valid datasource', 580);
+ }
}
return $datasources[$sourceName];
|
added check for instance exists on getConnection
|
diff --git a/src/de/mrapp/android/dialog/MaterialDialogBuilder.java b/src/de/mrapp/android/dialog/MaterialDialogBuilder.java
index <HASH>..<HASH> 100644
--- a/src/de/mrapp/android/dialog/MaterialDialogBuilder.java
+++ b/src/de/mrapp/android/dialog/MaterialDialogBuilder.java
@@ -387,8 +387,8 @@ public class MaterialDialogBuilder extends AlertDialog.Builder {
public MaterialDialogBuilder setItems(final int resourceId,
OnClickListener listener) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
- listAdapter = new ArrayAdapter<CharSequence>(context, resourceId);
- listViewClickListener = listener;
+ this.setItems(context.getResources().getTextArray(resourceId),
+ listener);
} else {
super.setItems(resourceId, listener);
}
|
Fixed the functionality to load list items from an array resource.
|
diff --git a/phabricator/__init__.py b/phabricator/__init__.py
index <HASH>..<HASH> 100644
--- a/phabricator/__init__.py
+++ b/phabricator/__init__.py
@@ -370,7 +370,7 @@ class Phabricator(Resource):
self.clientDescription = socket.gethostname() + ':python-phabricator'
self._conduit = None
- super(Phabricator, self).__init__(self)
+ super(Phabricator, self).__init__(self, **kwargs)
def _request(self, **kwargs):
raise SyntaxError('You cannot call the Conduit API without a resource.')
|
Forward kwargs (#<I>)
|
diff --git a/lib/slimmer/skin.rb b/lib/slimmer/skin.rb
index <HASH>..<HASH> 100644
--- a/lib/slimmer/skin.rb
+++ b/lib/slimmer/skin.rb
@@ -93,6 +93,7 @@ module Slimmer
if defined?(Airbrake)
Airbrake.notify_or_ignore(e, rack_env: rack_env)
end
+ raise if strict
end
processor_end_time = Time.now
process_time = processor_end_time - processor_start_time
|
Don't swallow exceptions when running in test
Previously, exceptions from processors were always swallowed, and there
are several tests which trigger such exceptions but don't report them.
We want these exceptions to be reported in test and dev environments so
that we can fix them; continuing to swallow the exceptions in production
is probably a good thing.
Exceptions in production/preview are reported to errbit, as before.
|
diff --git a/lib/BodyParser.php b/lib/BodyParser.php
index <HASH>..<HASH> 100644
--- a/lib/BodyParser.php
+++ b/lib/BodyParser.php
@@ -55,7 +55,9 @@ class BodyParser implements Observable {
\Amp\defer(function() {
if ($this->parsing === true) {
- new Coroutine($this->initIncremental());
+ $awaitable = new Coroutine($this->initIncremental());
+ } else {
+ $awaitable = null;
}
$this->body->when(function ($e, $data) {
$this->req = null;
@@ -88,6 +90,7 @@ class BodyParser implements Observable {
$this->subscribers = [];
}
});
+ return $awaitable;
});
}
@@ -279,7 +282,7 @@ class BodyParser implements Observable {
$this->fail($e);
}
- // this should be inside a defer (not direct Coroutine) to give user a chance to install watch() handlers
+ // this should be inside a defer (not direct Coroutine) to give user a chance to install subscribe() handlers
private function initIncremental() {
if ($this->parsing !== true) {
return;
|
Return awaitable from defer callback
|
diff --git a/internal/provider/resource_password_test.go b/internal/provider/resource_password_test.go
index <HASH>..<HASH> 100644
--- a/internal/provider/resource_password_test.go
+++ b/internal/provider/resource_password_test.go
@@ -508,10 +508,11 @@ func TestAccResourcePassword_Min(t *testing.T) {
// TestAccResourcePassword_UpgradeFromVersion2_2_1 requires that you are running an amd64 Terraform binary
// if you are running this test locally on arm64 architecture otherwise you will see the following error:
-// Error: Incompatible provider version
//
-// Provider registry.terraform.io/hashicorp/random v2.2.1 does not have a
-// package available for your current platform ...
+// Error: Incompatible provider version
+//
+// Provider registry.terraform.io/hashicorp/random v2.2.1 does not have a
+// package available for your current platform ...
//
// TestAccResourcePassword_UpgradeFromVersion2_2_1 verifies behaviour when upgrading state from schema V0 to V2.
func TestAccResourcePassword_UpgradeFromVersion2_2_1(t *testing.T) {
|
Linting (#<I>)
|
diff --git a/chance.js b/chance.js
index <HASH>..<HASH> 100644
--- a/chance.js
+++ b/chance.js
@@ -59,6 +59,27 @@
return num;
};
+
+ Chance.prototype.normal = function(options) {
+ // The Marsaglia Polar method
+ var s, u, v, norm,
+ mean = options.mean || 0,
+ dev = (typeof options.dev !== 'undefined') ? options.dev : 1;
+
+ do {
+ // U and V are from the uniform distribution on (-1, 1)
+ u = this.random() * 2 - 1;
+ v = this.random() * 2 - 1;
+
+ s = u * u + v * v;
+ } while (s < 1);
+
+ // Compute the standard normal variate
+ norm = u * Math.sqrt(-2 * Math.log(s) / s);
+
+ // Shape and scale
+ return dev * norm + mean;
+ };
Chance.prototype.character = function (options) {
options = options || {};
|
Adding ability to generate from normal distribution
|
diff --git a/lib/xmldb/classes/generators/mysql/mysql.class.php b/lib/xmldb/classes/generators/mysql/mysql.class.php
index <HASH>..<HASH> 100644
--- a/lib/xmldb/classes/generators/mysql/mysql.class.php
+++ b/lib/xmldb/classes/generators/mysql/mysql.class.php
@@ -62,7 +62,7 @@ class XMLDBmysql extends XMLDBGenerator {
var $alter_column_sql = 'ALTER TABLE TABLENAME MODIFY COLUMN COLUMNSPECS'; //The SQL template to alter columns
- var $drop_index_sql = 'DROP INDEX INDEXNAME ON TABLENAME'; //SQL sentence to drop one index
+ var $drop_index_sql = 'ALTER TABLE TABLENAME DROP INDEX INDEXNAME'; //SQL sentence to drop one index
//TABLENAME, INDEXNAME are dinamically replaced
/**
|
changed mysql drop index syntax. Nothing relevant.
|
diff --git a/lib/vagrant/util/subprocess.rb b/lib/vagrant/util/subprocess.rb
index <HASH>..<HASH> 100644
--- a/lib/vagrant/util/subprocess.rb
+++ b/lib/vagrant/util/subprocess.rb
@@ -105,10 +105,15 @@ module Vagrant
# amount of text between the time we last read data and when the
# process exited.
[stdout, stderr].each do |io|
+ # Read the extra data, ignoring if there isn't any
extra_data = read_io(io)
+ next if extra_data == ""
+
+ # Log it out and accumulate
@logger.debug(extra_data)
io_data[io] += extra_data
+ # Yield to any listeners any remaining data
io_name = io == stdout ? :stdout : :stderr
yield io_name, extra_data if block_given?
end
|
Subprocess: Check if data is empty after the process exits as well
|
diff --git a/lib/task-data/base-tasks/obm.js b/lib/task-data/base-tasks/obm.js
index <HASH>..<HASH> 100644
--- a/lib/task-data/base-tasks/obm.js
+++ b/lib/task-data/base-tasks/obm.js
@@ -7,8 +7,7 @@ module.exports = {
injectableName: 'Task.Base.Obm.Node',
runJob: 'Job.Obm.Node',
requiredOptions: [
- 'action',
- 'obmServiceName'
+ 'action'
],
requiredProperties: {},
properties: {
|
fix CI tests, remove required obm settings from base task (#<I>)
|
diff --git a/chef/spec/unit/chef_fs/diff_spec.rb b/chef/spec/unit/chef_fs/diff_spec.rb
index <HASH>..<HASH> 100644
--- a/chef/spec/unit/chef_fs/diff_spec.rb
+++ b/chef/spec/unit/chef_fs/diff_spec.rb
@@ -82,7 +82,9 @@ describe 'diff' do
it 'Chef::ChefFS::CommandLine.diff(/)' do
results = []
Chef::ChefFS::CommandLine.diff(pattern('/'), a, b, nil, nil) do |diff|
- results << diff.gsub(/\s+\d\d\d\d-\d\d-\d\d\s\d?\d:\d\d:\d\d\.\d{9} -\d\d\d\d/, ' DATE')
+ # Removes the date stamp from the diff and replaces it with ' DATE'
+ # example match: "/dev/null\t2012-10-16 16:15:54.000000000 +0000"
+ results << diff.gsub(/\s+\d\d\d\d-\d\d-\d\d\s\d?\d:\d\d:\d\d\.\d{9} [+-]\d\d\d\d/, ' DATE')
end
results.should =~ [
'diff --knife a/both_dirs/sub_both_files_different b/both_dirs/sub_both_files_different
|
Handle GMT and postive time zones in spec test
|
diff --git a/lib/passive_record/version.rb b/lib/passive_record/version.rb
index <HASH>..<HASH> 100644
--- a/lib/passive_record/version.rb
+++ b/lib/passive_record/version.rb
@@ -1,4 +1,4 @@
module PassiveRecord
# passive_record version
- VERSION = "0.3.22"
+ VERSION = "0.4.0"
end
|
version bump to minor version <I>
- compatibility with ruby <I>
|
diff --git a/Firestore/synth.py b/Firestore/synth.py
index <HASH>..<HASH> 100644
--- a/Firestore/synth.py
+++ b/Firestore/synth.py
@@ -23,7 +23,7 @@ logging.basicConfig(level=logging.DEBUG)
gapic = gcp.GAPICBazel()
common = gcp.CommonTemplates()
-for ver in ['V1', 'V1beta1']:
+for ver in ['V1']:
lower_version = ver.lower()
library = gapic.php_library(
|
chore: disable updating v1beta1 client (#<I>)
|
diff --git a/src/Paystack/Http/RequestBuilder.php b/src/Paystack/Http/RequestBuilder.php
index <HASH>..<HASH> 100644
--- a/src/Paystack/Http/RequestBuilder.php
+++ b/src/Paystack/Http/RequestBuilder.php
@@ -4,6 +4,7 @@ namespace Yabacon\Paystack\Http;
use \Yabacon\Paystack\Contracts\RouteInterface;
use \Yabacon\Paystack\Helpers\Router;
+use \Yabacon\Paystack;
class RequestBuilder
{
@@ -26,6 +27,7 @@ class RequestBuilder
public function build()
{
$this->request->headers["Authorization"] = "Bearer " . $this->paystackObj->secret_key;
+ $this->request->headers["User-Agent"] = "Paystack/v1 PhpBindings/" . Paystack::VERSION;
$this->request->endpoint = Router::PAYSTACK_API_ROOT . $this->interface[RouteInterface::ENDPOINT_KEY];
$this->request->method = $this->interface[RouteInterface::METHOD_KEY];
$this->moveArgsToSentargs();
|
[chore] Add User-Agent header to requests
|
diff --git a/src/Api/Repositories/Workspaces/PipelinesConfig.php b/src/Api/Repositories/Workspaces/PipelinesConfig.php
index <HASH>..<HASH> 100644
--- a/src/Api/Repositories/Workspaces/PipelinesConfig.php
+++ b/src/Api/Repositories/Workspaces/PipelinesConfig.php
@@ -13,6 +13,7 @@ declare(strict_types=1);
namespace Bitbucket\Api\Repositories\Workspaces;
+use Bitbucket\Api\Repositories\Workspaces\PipelinesConfig\Variables;
use Bitbucket\HttpClient\Util\UriBuilder;
/**
@@ -23,6 +24,14 @@ use Bitbucket\HttpClient\Util\UriBuilder;
class PipelinesConfig extends AbstractWorkspacesApi
{
/**
+ * @return \Bitbucket\Api\Repositories\Workspaces\PipelinesConfig\Variables
+ */
+ public function variables()
+ {
+ return new Variables($this->getClient(), $this->workspace, $this->repo);
+ }
+
+ /**
* @param array $params
*
* @throws \Http\Client\Exception
|
[<I>] Added missing `PipelinesConfig::variables()` method to point to existing implementation (#<I>)
|
diff --git a/mutagen/id3/_specs.py b/mutagen/id3/_specs.py
index <HASH>..<HASH> 100644
--- a/mutagen/id3/_specs.py
+++ b/mutagen/id3/_specs.py
@@ -463,7 +463,7 @@ class ID3TimeStamp(object):
return repr(self.text)
def __eq__(self, other):
- return self.text == other.text
+ return isinstance(other, ID3TimeStamp) and self.text == other.text
def __lt__(self, other):
return self.text < other.text
|
id3.ID3TimeStamp comparator: check type (#<I>)
pyyaml's yaml.dump() failed because it apparently compares instances of ID3TimeStamp with None and empty tuples
|
diff --git a/lib/active_record/id_regions.rb b/lib/active_record/id_regions.rb
index <HASH>..<HASH> 100644
--- a/lib/active_record/id_regions.rb
+++ b/lib/active_record/id_regions.rb
@@ -37,6 +37,10 @@ module ArRegion
@@rails_sequence_end ||= rails_sequence_start + rails_sequence_factor - 1
end
+ def rails_sequence_range
+ rails_sequence_start..rails_sequence_end
+ end
+
def clear_region_cache
@@my_region_number = @@rails_sequence_start = @@rails_sequence_end = nil
end
@@ -164,4 +168,4 @@ module ArRegion
end
end
-ActiveRecord::Base.include ArRegion
+ApplicationRecord.include ArRegion
|
Move ArRegion to ApplicationRecord
In the process, instead of maintaining a direct dependency on our
method, pass the sequence range to rubyrep via config.
(transferred from ManageIQ/manageiq@f<I>a<I>da<I>cb<I>cee9e<I>e<I>ce9)
|
diff --git a/Command/ActivateUserCommand.php b/Command/ActivateUserCommand.php
index <HASH>..<HASH> 100644
--- a/Command/ActivateUserCommand.php
+++ b/Command/ActivateUserCommand.php
@@ -72,7 +72,7 @@ EOT
}
$this->eventDispatcher->dispatch(AdminSecurityEvents::ACTIVATION, new ActivationEvent($user));
- $output->writeln(sprintf('User <comment>%s</comment> has been deactivated', $email));
+ $output->writeln(sprintf('User <comment>%s</comment> has been activated', $email));
}
protected function interact(InputInterface $input, OutputInterface $output): void
diff --git a/Command/DeactivateUserCommand.php b/Command/DeactivateUserCommand.php
index <HASH>..<HASH> 100644
--- a/Command/DeactivateUserCommand.php
+++ b/Command/DeactivateUserCommand.php
@@ -73,7 +73,7 @@ EOT
}
$this->eventDispatcher->dispatch(AdminSecurityEvents::DEACTIVATION, new ActivationEvent($user));
- $output->writeln(sprintf('User <comment>%s</comment> has been activated', $email));
+ $output->writeln(sprintf('User <comment>%s</comment> has been deactivated', $email));
}
protected function interact(InputInterface $input, OutputInterface $output): void
|
Fixed activate/deactive user command success messages
|
diff --git a/mode/rust/rust.js b/mode/rust/rust.js
index <HASH>..<HASH> 100644
--- a/mode/rust/rust.js
+++ b/mode/rust/rust.js
@@ -68,4 +68,5 @@ CodeMirror.defineSimpleMode("rust",{
CodeMirror.defineMIME("text/x-rustsrc", "rust");
+CodeMirror.defineMIME("text/rust", "rust");
});
|
[rust mode] Add proper MIME type
leave the old one for now
|
diff --git a/rbac/AuthorizerBehavior.php b/rbac/AuthorizerBehavior.php
index <HASH>..<HASH> 100644
--- a/rbac/AuthorizerBehavior.php
+++ b/rbac/AuthorizerBehavior.php
@@ -73,7 +73,7 @@ class AuthorizerBehavior extends Behavior
$schema = $owner->getDb()->getSchema();
$t = $schema->quoteSimpleTableName('t');
- $pks = $owner->getTableSchema()->primaryKey;
+ $pks = $owner->primaryKey();
$pkConditions = [];
$pkParams = [];
|
fix fetching pk in AuthorizerBehavior
|
diff --git a/lib/para/components_configuration.rb b/lib/para/components_configuration.rb
index <HASH>..<HASH> 100644
--- a/lib/para/components_configuration.rb
+++ b/lib/para/components_configuration.rb
@@ -51,18 +51,18 @@ module Para
end
def components_installed?
- non_existant_table = %w(components component_sections).any? do |name|
- !ActiveRecord::Base.table_exists?("para_#{ name }")
+ tables_exist = %w(components component_sections).all? do |name|
+ ActiveRecord::Base.table_exists?("para_#{ name }")
end
- if non_existant_table
+ unless tables_exist
Rails.logger.warn(
"Para migrations are not installed.\n" \
"Skipping components definition until next app reload."
)
end
- non_existant_table
+ tables_exist
end
def eager_load_components!
|
invert Components_configuration#components_installed? logic to make it work
|
diff --git a/gala/coordinates/gd1.py b/gala/coordinates/gd1.py
index <HASH>..<HASH> 100644
--- a/gala/coordinates/gd1.py
+++ b/gala/coordinates/gd1.py
@@ -60,6 +60,11 @@ class GD1Koposov10(coord.BaseCoordinateFrame):
coord.SphericalRepresentation)):
self._data.lon.wrap_angle = self._default_wrap_angle
+<<<<<<< HEAD
+=======
+ def represent_as():
+ pass
+>>>>>>> skip whatsnew doctests and link to scf heading
# Rotation matrix as defined in the Appendix of Koposov et al. (2010)
R = np.array([[-0.4776303088, -0.1738432154, 0.8611897727],
|
skip whatsnew doctests and link to scf heading
|
diff --git a/satpy/readers/abi_l1b.py b/satpy/readers/abi_l1b.py
index <HASH>..<HASH> 100644
--- a/satpy/readers/abi_l1b.py
+++ b/satpy/readers/abi_l1b.py
@@ -86,6 +86,9 @@ class NC_ABI_L1B(BaseFileHandler):
# handle coordinates (and recursive fun)
new_coords = {}
+ # 'time' dimension causes issues in other processing
+ if 'time' in data.coords:
+ del data.coords['time']
if item in data.coords:
self.coords[item] = data
for coord_name in data.coords.keys():
@@ -93,6 +96,7 @@ class NC_ABI_L1B(BaseFileHandler):
self.coords[coord_name] = self[coord_name]
new_coords[coord_name] = self.coords[coord_name]
data.coords.update(new_coords)
+ print(data.coords.keys())
return data
def get_shape(self, key, info):
|
Remove time coordinate for ABI data
It causes issues when making composites
|
diff --git a/addon/comment/comment.js b/addon/comment/comment.js
index <HASH>..<HASH> 100644
--- a/addon/comment/comment.js
+++ b/addon/comment/comment.js
@@ -44,9 +44,17 @@
}
});
+ // Rough heuristic to try and detect lines that are part of multi-line string
+ function probablyInsideString(cm, pos, line) {
+ return /\bstring\b/.test(cm.getTokenTypeAt(Pos(pos.line, 0))) && !/^[\'\"`]/.test(line)
+ }
+
CodeMirror.defineExtension("lineComment", function(from, to, options) {
if (!options) options = noOptions;
var self = this, mode = self.getModeAt(from);
+ var firstLine = self.getLine(from.line);
+ if (firstLine == null || probablyInsideString(self, from, firstLine)) return;
+
var commentString = options.lineComment || mode.lineComment;
if (!commentString) {
if (options.blockCommentStart || mode.blockCommentStart) {
@@ -55,8 +63,7 @@
}
return;
}
- var firstLine = self.getLine(from.line);
- if (firstLine == null) return;
+
var end = Math.min(to.ch != 0 || to.line == from.line ? to.line + 1 : to.line, self.lastLine() + 1);
var pad = options.padding == null ? " " : options.padding;
var blankLines = options.commentBlankLines || from.line == to.line;
|
[comment addon] Don't toggle comments inside multi-line strings
Issue #<I>
|
diff --git a/trunk/mlcp/src/main/java/com/marklogic/contentpump/AggregateXMLReader.java b/trunk/mlcp/src/main/java/com/marklogic/contentpump/AggregateXMLReader.java
index <HASH>..<HASH> 100644
--- a/trunk/mlcp/src/main/java/com/marklogic/contentpump/AggregateXMLReader.java
+++ b/trunk/mlcp/src/main/java/com/marklogic/contentpump/AggregateXMLReader.java
@@ -276,7 +276,7 @@ public class AggregateXMLReader<VALUEIN> extends ImportRecordReader<VALUEIN> {
sb.append(name);
}
// add namespaces declared into the new root element
- if (isNewRootStart && namespace != null) {
+ if (isNewRootStart) {
Set<String> keys = nameSpaces.keySet();
for (String k : keys) {
String v = nameSpaces.get(k).peek();
|
Bug:<I> add known namespace declarations into root element no matter root has namespace or not
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100755
--- a/index.js
+++ b/index.js
@@ -17,7 +17,7 @@ module.exports = function (FAT_REMOTE, SKIM_REMOTE, port, pouchPort, urlBase, lo
var startingTimeout = 1000;
logger.silly('\nWelcome!');
logger.info('To start using local-npm, just run: ');
- logger.code('\n $ npm set registry http://127.0.0.1:' + port);
+ logger.code('\n $ npm set registry ' + urlBase);
logger.info('\nTo switch back, you can run: ');
logger.code('\n $ npm set registry ' + FAT_REMOTE);
logger.info('\nA simple npm-like UI is available here: http://127.0.0.1:' + port + '/_browse');
@@ -131,9 +131,6 @@ module.exports = function (FAT_REMOTE, SKIM_REMOTE, port, pouchPort, urlBase, lo
});
return doc;
}
- app.all('/*', function (req, res) {
- res.send(500);
- });
var sync;
function replicateSkim() {
skimRemote.info().then(function (info) {
|
suggest they point it to urlbase
|
diff --git a/Controller/ConnectController.php b/Controller/ConnectController.php
index <HASH>..<HASH> 100644
--- a/Controller/ConnectController.php
+++ b/Controller/ConnectController.php
@@ -342,6 +342,10 @@ final class ConnectController extends AbstractController
$event = new FilterUserResponseEvent($currentUser, $request, $response);
$this->dispatch($event, HWIOAuthEvents::CONNECT_COMPLETED);
+ if (null !== $event->getResponse()) {
+ return $event->getResponse();
+ }
+
return $response;
}
|
Customizing the CONNECT_COMPLETED response
Accepting the response from the event listener associated with HWIOAuthEvents::CONNECT_COMPLETED whenever it's set instead of always using the @HWIOAuth/Connect/connect_success.html.twig template rendering
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@ setup(
platforms='any',
install_requires=[
'Flask>=0.10.1',
- 'pyldap'
+ 'python-ldap'
],
classifiers=[
'Environment :: Web Environment',
|
Replace pyldap with python-ldap in setup.py
pyldap is deprecated in favor of python-ldap
|
diff --git a/packages/discord.js/src/structures/InteractionCollector.js b/packages/discord.js/src/structures/InteractionCollector.js
index <HASH>..<HASH> 100644
--- a/packages/discord.js/src/structures/InteractionCollector.js
+++ b/packages/discord.js/src/structures/InteractionCollector.js
@@ -45,16 +45,14 @@ class InteractionCollector extends Collector {
* @type {?Snowflake}
*/
this.channelId =
- this.client.channels.resolveId(options.message?.channel) ??
- options.message?.channel_id ??
- this.client.channels.resolveId(options.channel);
+ options.message?.channelId ?? options.message?.channel_id ?? this.client.channels.resolveId(options.channel);
/**
* The guild from which to collect interactions, if provided
* @type {?Snowflake}
*/
this.guildId =
- this.client.guilds.resolveId(options.message?.guild) ??
+ options.message?.guildId ??
options.message?.guild_id ??
this.client.guilds.resolveId(options.channel?.guild) ??
this.client.guilds.resolveId(options.guild);
@@ -83,7 +81,6 @@ class InteractionCollector extends Collector {
*/
this.total = 0;
- this.empty = this.empty.bind(this);
this.client.incrementMaxListeners();
const bulkDeleteListener = messages => {
|
refactor(InteractionCollector): simplify constructor logic (#<I>)
* refactor(InteractionCollector): simplify constructor logic
* fix: oversight
|
diff --git a/libraries/joomla/access/access.php b/libraries/joomla/access/access.php
index <HASH>..<HASH> 100644
--- a/libraries/joomla/access/access.php
+++ b/libraries/joomla/access/access.php
@@ -464,7 +464,7 @@ class JAccess
JLog::add(__METHOD__ . ' is deprecated. Use JAccess::getActionsFromFile or JAcces::getActionsFromData instead.', JLog::WARNING, 'deprecated');
$actions = self::getActionsFromFile(
JPATH_ADMINISTRATOR . '/components/' . $component . '/access.xml',
- "/access/section[@name='" . $section . "']"
+ "/access/section[@name='" . $section . "']/"
);
if (empty($actions))
{
|
Fix a wrong xpath expression in JAccess.
|
diff --git a/lib/jboss-cloud/rpm-utils.rb b/lib/jboss-cloud/rpm-utils.rb
index <HASH>..<HASH> 100644
--- a/lib/jboss-cloud/rpm-utils.rb
+++ b/lib/jboss-cloud/rpm-utils.rb
@@ -99,6 +99,8 @@ module JBossCloud
compare_file_and_upload( sftp, srpm_file, "#{srpms_package_dir}/#{File.basename( srpm_file )}" )
end
+ puts "Refreshing repository information in #{srpms_package_dir}..."
+ ssh.exec!( "createrepo #{srpms_package_dir}" )
end
puts "Disconnecting from remote server..."
@@ -115,7 +117,6 @@ module JBossCloud
rescue Net::SFTP::StatusException => e
raise unless e.code == 2
upload_file( sftp, file, remote_file )
- next
end
if File.stat(file).mtime > Time.at(rstat.mtime) or File.size(file) != rstat.size
|
refreshing SRPMs repo directory
|
diff --git a/lib/cancan/controller_resource.rb b/lib/cancan/controller_resource.rb
index <HASH>..<HASH> 100644
--- a/lib/cancan/controller_resource.rb
+++ b/lib/cancan/controller_resource.rb
@@ -83,6 +83,10 @@ module CanCan
def build_resource
resource = resource_base.new(resource_params || {})
+ assign_attributes(resource)
+ end
+
+ def assign_attributes(resource)
resource.send("#{parent_name}=", parent_resource) if @options[:singleton] && parent_resource
initial_attributes.each do |attr_name, value|
resource.send("#{attr_name}=", value)
|
Fix pull request <I>. For some reason github didn't allow a clean merge althought there weren't any conflicts. Fix it so that it's easier to just merge via the UI.
|
diff --git a/pytuya/__init__.py b/pytuya/__init__.py
index <HASH>..<HASH> 100644
--- a/pytuya/__init__.py
+++ b/pytuya/__init__.py
@@ -125,7 +125,7 @@ payload_dict = {
}
class XenonDevice(object):
- def __init__(self, dev_id, address, local_key=None, dev_type=None):
+ def __init__(self, dev_id, address, local_key=None, dev_type=None, connection_timeout=10):
"""
Represents a Tuya device.
@@ -145,6 +145,7 @@ class XenonDevice(object):
self.local_key = local_key
self.local_key = local_key.encode('latin1')
self.dev_type = dev_type
+ self.connection_timeout = connection_timeout
self.port = 6668 # default - do not expect caller to pass in
@@ -159,6 +160,7 @@ class XenonDevice(object):
payload(bytes): Data to send.
"""
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+ s.settimeout(self.connection_timeout)
s.connect((self.address, self.port))
s.send(payload)
data = s.recv(1024)
|
Add configurable timeout so connection won't block if something gets stuck
|
diff --git a/shared/reporting-core/src/main/java/com/base2/kagura/core/report/connectors/FreemarkerSQLDataReportConnector.java b/shared/reporting-core/src/main/java/com/base2/kagura/core/report/connectors/FreemarkerSQLDataReportConnector.java
index <HASH>..<HASH> 100644
--- a/shared/reporting-core/src/main/java/com/base2/kagura/core/report/connectors/FreemarkerSQLDataReportConnector.java
+++ b/shared/reporting-core/src/main/java/com/base2/kagura/core/report/connectors/FreemarkerSQLDataReportConnector.java
@@ -57,7 +57,7 @@ public abstract class FreemarkerSQLDataReportConnector extends ReportConnector {
statement.setObject(i + 1, prefreemarkerSQLResult.getParams().get(i));
}
statement.setQueryTimeout(queryTimeout);
- statement.executeBatch();
+ statement.execute();
}
FreemarkerSQLResult freemarkerSQLResult = freemakerParams(extra, true, freemarkerSql);
statement = connection.prepareStatement(freemarkerSQLResult.getSql());
@@ -74,7 +74,7 @@ public abstract class FreemarkerSQLDataReportConnector extends ReportConnector {
statement.setObject(i + 1, postfreemarkerSQLResult.getParams().get(i));
}
statement.setQueryTimeout(queryTimeout);
- statement.executeBatch();
+ statement.execute();
}
} catch (Exception ex) {
errors.add(ex.getMessage());
|
Switched from batchExecute to normal execute.
|
diff --git a/lib/spatial_features/importers/shapefile.rb b/lib/spatial_features/importers/shapefile.rb
index <HASH>..<HASH> 100644
--- a/lib/spatial_features/importers/shapefile.rb
+++ b/lib/spatial_features/importers/shapefile.rb
@@ -4,6 +4,11 @@ require 'digest/md5'
module SpatialFeatures
module Importers
class Shapefile < Base
+ def initialize(data, *args, proj4: nil)
+ super(data, *args)
+ @proj4 = proj4
+ end
+
def cache_key
@cache_key ||= Digest::MD5.hexdigest(features.to_json)
end
@@ -12,10 +17,14 @@ module SpatialFeatures
def each_record(&block)
file = Download.open(@data, unzip: '.shp')
- proj4 = proj4_from_file(file)
+
+ if !@proj4
+ @proj4 = proj4_from_file(file)
+ end
+
RGeo::Shapefile::Reader.open(file.path) do |records|
records.each do |record|
- yield OpenStruct.new data_from_wkt(record.geometry.as_text, proj4).merge(:metadata => record.attributes) if record.geometry.present?
+ yield OpenStruct.new data_from_wkt(record.geometry.as_text, @proj4).merge(:metadata => record.attributes) if record.geometry.present?
end
end
end
|
Allow shapefile import to specify projection
If a shapefile doesn’t come with a projection file, it is now possible to specify it manually instead.
|
diff --git a/src/languages/Estonian.php b/src/languages/Estonian.php
index <HASH>..<HASH> 100644
--- a/src/languages/Estonian.php
+++ b/src/languages/Estonian.php
@@ -4,7 +4,7 @@ namespace js\tools\numbers2words\languages;
use js\tools\numbers2words\exceptions\InvalidArgumentException;
use js\tools\numbers2words\Speller;
-class Estonian extends Speller
+final class Estonian extends Speller
{
protected $minus = 'miinus';
protected $decimalSeparator = ' ja ';
|
This should be final, like all other language classes.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -82,6 +82,8 @@ install_requires = [
'mistune>=0.7.2',
'six>=1.10.0',
'uritemplate.py>=0.2.0,<2.0',
+ 'urllib3<1.25,>=1.21.1', # from "invenio-search"
+ 'idna>=2.5,<2.8', # from "invenio-search"
]
packages = find_packages()
|
setup: fix package conflicts with invenio-search
|
diff --git a/app/controllers/deep_unrest/application_controller.rb b/app/controllers/deep_unrest/application_controller.rb
index <HASH>..<HASH> 100644
--- a/app/controllers/deep_unrest/application_controller.rb
+++ b/app/controllers/deep_unrest/application_controller.rb
@@ -9,6 +9,7 @@ module DeepUnrest
# rails can't deal with array indices in params (converts them to hashes)
# see https://gist.github.com/bloudermilk/2884947
def repair_nested_params(obj)
+ return unless obj.respond_to?(:each)
obj.each do |key, value|
if value.is_a?(ActionController::Parameters) || value.is_a?(Hash)
# If any non-integer keys
|
[bugfix] only try to recurse through nested params if param is iterable
|
diff --git a/lib/commands/run.js b/lib/commands/run.js
index <HASH>..<HASH> 100644
--- a/lib/commands/run.js
+++ b/lib/commands/run.js
@@ -159,7 +159,9 @@ function run(scriptPath, options) {
ee.once('done', function(report) {
- cli.spinner('', true);
+ if (tty.isatty(process.stdout)) {
+ cli.spinner('', true);
+ }
console.log('all scenarios completed');
console.log('Complete report @ %s', report.aggregate.timestamp);
|
Fix for when stdout is not a tty
|
diff --git a/src/MemoryState.js b/src/MemoryState.js
index <HASH>..<HASH> 100644
--- a/src/MemoryState.js
+++ b/src/MemoryState.js
@@ -35,13 +35,11 @@ class LockOperations {
(retry, n) => {
if (this.locks.has(key)) {
let err = new ChatServiceError('timeout')
- return retry(err)
+ retry(err)
} else {
this.locks.set(key, val)
- return Promise.resolve()
}
- }
- )
+ })
}
unlock (key, val) {
diff --git a/src/RedisState.js b/src/RedisState.js
index <HASH>..<HASH> 100644
--- a/src/RedisState.js
+++ b/src/RedisState.js
@@ -67,9 +67,7 @@ class LockOperations {
return this.redis.set(key, val, 'NX', 'PX', ttl).then(res => {
if (!res) {
let error = new ChatServiceError('timeout')
- return retry(error)
- } else {
- return null
+ retry(error)
}
}).catch(retry)
})
|
refactor: retry cleanup
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -44,10 +44,10 @@ function configureAxe (defaultOptions = {}) {
}
/**
- * Custom jest expect matcher, that can check aXe results for violations.
+ * Custom Jest expect matcher, that can check aXe results for violations.
* @param {results} object requires an instance of aXe's results object
* (https://github.com/dequelabs/axe-core/blob/develop-2x/doc/API.md#results-object)
- * @returns {object} returns jest matcher object
+ * @returns {object} returns Jest matcher object
*/
const toHaveNoViolations = {
toHaveNoViolations (results) {
|
Nit: fix capitalization in comment blocks
|
diff --git a/currencies/__init__.py b/currencies/__init__.py
index <HASH>..<HASH> 100644
--- a/currencies/__init__.py
+++ b/currencies/__init__.py
@@ -1 +1 @@
-VERSION = '0.1'
+VERSION = '0.2.1'
|
Forgot to bumb the version number...
|
diff --git a/woven/utils.py b/woven/utils.py
index <HASH>..<HASH> 100644
--- a/woven/utils.py
+++ b/woven/utils.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
from __future__ import with_statement
-import os, sys, tempfile
+import os, shutil, sys, tempfile
from functools import wraps
from pkg_resources import parse_version
@@ -185,6 +185,10 @@ def parse_project_version(version=''):
return project_version
+def rmtmpdirs():
+ for path in env.woventempdirs:
+ shutil.rmtree(path,ignore_errors=True)
+
def root_domain():
"""
Deduce the root domain name, usually a 'naked' domain but not necessarily.
|
added in a local /tmp dir cleanup function
|
diff --git a/main.js b/main.js
index <HASH>..<HASH> 100644
--- a/main.js
+++ b/main.js
@@ -82,7 +82,11 @@ manager.prototype.connect = function(options) {
var result = q.defer();
var self = this;
if (!this.cb) {
- this.cb = new cb.Connection(options || {}, function(err) {
+ var builder = cb.Connection;
+ if (options.mock) {
+ builder = cb.Mock.Connection;
+ }
+ this.cb = new builder(options || {}, function(err) {
if (err) {
result.reject(err);
self.emit('error', err);
@@ -92,6 +96,10 @@ manager.prototype.connect = function(options) {
self.emit('connect', self);
}
});
+ if (options.mock) {
+ result.resolve(this);
+ self.emit('connect', this);
+ }
} else {
result.resolve(self);
}
|
implement a mock option on connection to pass tests
|
diff --git a/app/models/blog_sweeper.rb b/app/models/blog_sweeper.rb
index <HASH>..<HASH> 100644
--- a/app/models/blog_sweeper.rb
+++ b/app/models/blog_sweeper.rb
@@ -33,7 +33,7 @@ class BlogSweeper < ActionController::Caching::Sweeper
end
def after_save(record)
- expire_for(record)
+ expire_for(record) unless (record.is_a?(Article) and record.state.downcase == 'draft')
end
def after_destroy(record)
|
Don't sweep the cache if we're saving a draft.
Without this change, having the article editor open to write a new article
will cause the cache to be continuously sweeped without reason.
|
diff --git a/blueprints/route/index.js b/blueprints/route/index.js
index <HASH>..<HASH> 100644
--- a/blueprints/route/index.js
+++ b/blueprints/route/index.js
@@ -19,8 +19,7 @@ function addRouteToRouter(name, options) {
var type = options.type || 'route';
var routerPath = path.join(process.cwd(), 'app', 'router.coffee');
var oldContent = fs.readFileSync(routerPath, 'utf-8');
- // This probably won't work with coffeescript-files yet. I'll look at it later.
- var existence = new RegExp("(route|resource)\\(['\"]" + name + "'");
+ var existence = new RegExp("(?:route|resource)\\s?\\(?\\s?(['\"])" + name + "\\1");
var plural;
var newContent;
|
Fix not detecting duplicates in route generation
Also improved the regex a bit in general.
Fixes #4
|
diff --git a/devices/insta.js b/devices/insta.js
index <HASH>..<HASH> 100644
--- a/devices/insta.js
+++ b/devices/insta.js
@@ -21,7 +21,7 @@ module.exports = [
ota: ota.zigbeeOTA,
},
{
- zigbeeModel: ['Generic UP Device'],
+ zigbeeModel: ['NEXENTRO Blinds Actuator', 'Generic UP Device'],
model: '57008000',
vendor: 'Insta',
description: 'Blinds actor with lift/tilt calibration & with with inputs for wall switches',
|
Add NEXENTRO Blinds Actuator to <I> (#<I>)
add new Zigbee model for Insta <I>
|
diff --git a/js/coss.js b/js/coss.js
index <HASH>..<HASH> 100644
--- a/js/coss.js
+++ b/js/coss.js
@@ -57,6 +57,9 @@ module.exports = class coss extends Exchange {
'get': [
'coins/getinfo/all',
'order/symbols',
+ 'getmarketsummaries', // broken on COSS's end
+ 'market-price',
+ 'exchange-info',
],
},
'engine': {
@@ -70,9 +73,6 @@ module.exports = class coss extends Exchange {
'get': [
'account/balances',
'account/details',
- 'getmarketsummaries', // fetchTicker (broken on COSS's end)
- 'market-price',
- 'exchange-info',
],
'post': [
'order/add',
|
coss public endpoints moved to `public`
|
diff --git a/org/postgresql/test/jdbc2/UpdateableResultTest.java b/org/postgresql/test/jdbc2/UpdateableResultTest.java
index <HASH>..<HASH> 100644
--- a/org/postgresql/test/jdbc2/UpdateableResultTest.java
+++ b/org/postgresql/test/jdbc2/UpdateableResultTest.java
@@ -256,21 +256,21 @@ public class UpdateableResultTest extends TestCase
assertEquals(2, rs.getInt(1));
assertEquals(string, rs.getString(2));
assertEquals(string, rs.getString(3));
- assertEquals(bytes, rs.getBytes(4));
+ assertTrue(Arrays.equals(bytes, rs.getBytes(4)));
rs.refreshRow();
assertEquals(2, rs.getInt(1));
assertEquals(string, rs.getString(2));
assertEquals(string, rs.getString(3));
- assertEquals(bytes, rs.getBytes(4));
+ assertTrue(Arrays.equals(bytes, rs.getBytes(4)));
rs.next();
assertEquals(3, rs.getInt(1));
assertEquals(string, rs.getString(2));
assertEquals(string, rs.getString(3));
- assertEquals(bytes, rs.getBytes(4));
+ assertTrue(Arrays.equals(bytes, rs.getBytes(4)));
rs.close();
stmt.close();
|
Ugggh, compiling is not the same as working. Junit's assertEquals
converts things to strings which doesn't work for arrays. Use
Arrays.equals instead.
|
diff --git a/go/chat/flip/replay.go b/go/chat/flip/replay.go
index <HASH>..<HASH> 100644
--- a/go/chat/flip/replay.go
+++ b/go/chat/flip/replay.go
@@ -89,6 +89,14 @@ func extractUserDevices(v []UserDeviceCommitment) []UserDevice {
}
func Replay(ctx context.Context, rh ReplayHelper, gh GameHistory) (*GameSummary, error) {
+ ret, err := replay(ctx, rh, gh)
+ if err != nil {
+ rh.CLogf(ctx, "Replay failure (%s); game dump: %+v", err, gh)
+ }
+ return ret, err
+}
+
+func replay(ctx context.Context, rh ReplayHelper, gh GameHistory) (*GameSummary, error) {
var game *Game
var err error
|
debug the replay (#<I>)
|
diff --git a/src/Adr/src/Input.php b/src/Adr/src/Input.php
index <HASH>..<HASH> 100644
--- a/src/Adr/src/Input.php
+++ b/src/Adr/src/Input.php
@@ -10,7 +10,7 @@ use Venta\Contracts\Adr\Input as InputContract;
*
* @package Venta\Adr
*/
-class Input implements InputContract
+final class Input implements InputContract
{
/**
* @inheritDoc
|
Adr Input class marked final.
|
diff --git a/linux_proc_extras/check.py b/linux_proc_extras/check.py
index <HASH>..<HASH> 100644
--- a/linux_proc_extras/check.py
+++ b/linux_proc_extras/check.py
@@ -69,9 +69,7 @@ class MoreUnixCheck(AgentCheck):
ctxt_count = float(line.split(' ')[1])
self.monotonic_count('system.linux.context_switches', ctxt_count, tags=self.tags)
elif line.startswith('processes'):
- self.log.info(line)
process_count = int(line.split(' ')[1])
- self.log.info(process_count)
self.monotonic_count('system.linux.processes_created', process_count, tags=self.tags)
elif line.startswith('intr'):
interrupts = int(line.split(' ')[1])
|
removes info logging (other diffs are purposeful)
|
diff --git a/pyxid/internal.py b/pyxid/internal.py
index <HASH>..<HASH> 100644
--- a/pyxid/internal.py
+++ b/pyxid/internal.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
from struct import unpack
-import time
+import sys, time
from .constants import NO_KEY_DETECTED, FOUND_KEY_DOWN, FOUND_KEY_UP, \
KEY_RELEASE_BITMASK, INVALID_PORT_BITS
@@ -107,12 +107,20 @@ class XidConnection(object):
def write(self, command):
bytes_written = 0
+ cmd_bytes = []
+
+ for i in command:
+ if (sys.version_info >= (3, 0)):
+ cmd_bytes += i.encode('latin1')
+ else:
+ cmd_bytes += i
+
if self.__needs_interbyte_delay:
- for char in command:
- bytes_written += self.serial_port.write(char.encode('ASCII'))
+ for char in cmd_bytes:
+ bytes_written += self.serial_port.write([char])
time.sleep(0.001)
else:
- bytes_written = self.serial_port.write(command.encode('ASCII'))
+ bytes_written = self.serial_port.write(cmd_bytes)
return bytes_written
|
Making the set_pulse_duration function work more reliably.
|
diff --git a/i3pystatus/cpu_usage.py b/i3pystatus/cpu_usage.py
index <HASH>..<HASH> 100644
--- a/i3pystatus/cpu_usage.py
+++ b/i3pystatus/cpu_usage.py
@@ -85,7 +85,7 @@ class CpuUsage(IntervalModule):
continue
core = core.replace('usage_', '')
- string = self.formatter.format(format_string=self.format_all,
+ string = self.formatter.format(self.format_all,
core=core,
usage=usage)
core_strings.append(string)
|
Python <I> compatibility fix (format_string is now positional only)
|
diff --git a/lib/ronin/sessions/esmtp.rb b/lib/ronin/sessions/esmtp.rb
index <HASH>..<HASH> 100644
--- a/lib/ronin/sessions/esmtp.rb
+++ b/lib/ronin/sessions/esmtp.rb
@@ -41,6 +41,12 @@ module Ronin
options[:user] ||= @esmtp_user
options[:password] ||= @esmtp_password
+ if @port
+ print_info "Connecting to #{@host}:#{@port} ..."
+ else
+ print_info "Connecting to #{@host} ..."
+ end
+
return ::Net.esmtp_connect(@host,options,&block)
end
|
Added info output to Sessions::ESMTP.
|
diff --git a/agent/tcs/client/client.go b/agent/tcs/client/client.go
index <HASH>..<HASH> 100644
--- a/agent/tcs/client/client.go
+++ b/agent/tcs/client/client.go
@@ -15,7 +15,7 @@ package tcsclient
import (
"bytes"
- "errors"
+ "fmt"
"net/http"
"time"
@@ -69,15 +69,17 @@ func New(url string, region string, credentialProvider credentials.AWSCredential
func (cs *clientServer) Serve() error {
log.Debug("Starting websocket poll loop")
if cs.Conn == nil {
- return errors.New("nil connection")
+ return fmt.Errorf("nil connection")
}
- // Start the timer function to publish metrics to the backend.
- if cs.statsEngine != nil {
- cs.publishTicker = time.NewTicker(cs.publishMetricsInterval)
- go cs.publishMetrics()
+ if cs.statsEngine == nil {
+ return fmt.Errorf("uninitialized stats engine")
}
+ // Start the timer function to publish metrics to the backend.
+ cs.publishTicker = time.NewTicker(cs.publishMetricsInterval)
+ go cs.publishMetrics()
+
return cs.ConsumeMessages()
}
|
Don't consume messages in tcs if statsengine is empty
|
diff --git a/src/tweenjs/MotionGuidePlugin.js b/src/tweenjs/MotionGuidePlugin.js
index <HASH>..<HASH> 100644
--- a/src/tweenjs/MotionGuidePlugin.js
+++ b/src/tweenjs/MotionGuidePlugin.js
@@ -286,7 +286,7 @@ this.createjs = this.createjs||{};
* @static
*/
MotionGuidePlugin.calc = function(data, ratio, target) {
- if(data._segments == undefined){ MotionGuidePlugin.validate(data); }
+ if(data._segments == undefined){ throw("Missing critical pre-calculated information, please file a bug"); }
if(target == undefined){ target = {x:0, y:0, rotation:0}; }
var seg = data._segments;
var path = data.path;
|
Removed unstubbed function call, replaced with throw.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@ setup(
license = 'MIT',
packages = find_packages(exclude=['test-*']),
install_requires = ['requests>=2.7.0'],
- classifiers = (
+ classifiers = [
'Development Status :: 5 - Production/Stable',
'Intended Audience :: Science/Research',
'Intended Audience :: Developers',
@@ -44,5 +44,5 @@ setup(
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7'
- )
+ ]
)
|
classifiers needs to be a list, not a tuple
|
diff --git a/src/com/google/javascript/jscomp/Result.java b/src/com/google/javascript/jscomp/Result.java
index <HASH>..<HASH> 100644
--- a/src/com/google/javascript/jscomp/Result.java
+++ b/src/com/google/javascript/jscomp/Result.java
@@ -18,6 +18,7 @@ package com.google.javascript.jscomp;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
import java.util.Map;
import java.util.Set;
@@ -66,6 +67,7 @@ public class Result {
}
@VisibleForTesting
+ @Deprecated
public Result(
ImmutableList<JSError> errors,
ImmutableList<JSError> warnings,
@@ -87,4 +89,26 @@ public class Result {
null,
null);
}
+
+ /**
+ * Returns an almost empty result that is used for multistage compilation.
+ *
+ * <p>For multistage compilations, Result for stage1 only cares about errors and warnings. It is
+ * unnecessary to write all of other results in the disk.
+ */
+ public static Result createResultForStage1(Result result) {
+ VariableMap emptyVariableMap = new VariableMap(ImmutableMap.of());
+ return new Result(
+ result.errors,
+ result.warnings,
+ emptyVariableMap,
+ emptyVariableMap,
+ emptyVariableMap,
+ null,
+ null,
+ "",
+ null,
+ null,
+ null);
+ }
}
|
Add a static method for stage1 compilation.
This removes an annoying ErrorProne warning about unnecessary @VisibleForTesting.
-------------
Created by MOE: <URL>
|
diff --git a/lib/sonos/topology_node.rb b/lib/sonos/topology_node.rb
index <HASH>..<HASH> 100644
--- a/lib/sonos/topology_node.rb
+++ b/lib/sonos/topology_node.rb
@@ -15,7 +15,7 @@ module Sonos
end
def device
- @device || Device::Base.detect(ip)
+ @device ||= Device::Base.detect(ip)
end
end
end
|
Reuse devices created from topology nodes
|
diff --git a/src/Google/Service/Licensing/LicenseAssignmentList.php b/src/Google/Service/Licensing/LicenseAssignmentList.php
index <HASH>..<HASH> 100644
--- a/src/Google/Service/Licensing/LicenseAssignmentList.php
+++ b/src/Google/Service/Licensing/LicenseAssignmentList.php
@@ -32,10 +32,16 @@ class Google_Service_Licensing_LicenseAssignmentList extends Google_Collection
{
return $this->etag;
}
+ /**
+ * @param Google_Service_Licensing_LicenseAssignment
+ */
public function setItems($items)
{
$this->items = $items;
}
+ /**
+ * @return Google_Service_Licensing_LicenseAssignment
+ */
public function getItems()
{
return $this->items;
|
Autogenerated update for licensing version v1 (<I>-<I>-<I>)
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.