hash
stringlengths
40
40
diff
stringlengths
131
26.7k
message
stringlengths
7
694
project
stringlengths
5
67
split
stringclasses
1 value
diff_languages
stringlengths
2
24
e063718e4f5fa6435c6805d56bb72df3efbda38f
diff --git a/system/src/Grav/Common/Flex/Types/UserGroups/UserGroupObject.php b/system/src/Grav/Common/Flex/Types/UserGroups/UserGroupObject.php index <HASH>..<HASH> 100644 --- a/system/src/Grav/Common/Flex/Types/UserGroups/UserGroupObject.php +++ b/system/src/Grav/Common/Flex/Types/UserGroups/UserGroupObject.php @@ -16,6 +16,7 @@ use Grav\Common\Flex\Traits\FlexObjectTrait; use Grav\Common\User\Access; use Grav\Common\User\Interfaces\UserGroupInterface; use Grav\Framework\Flex\FlexObject; +use Grav\Framework\Flex\Traits\FlexMediaTrait; /** * Flex User Group @@ -29,6 +30,7 @@ class UserGroupObject extends FlexObject implements UserGroupInterface { use FlexGravTrait; use FlexObjectTrait; + use FlexMediaTrait; /** @var Access|null */ protected $_access;
Add media support for Flex UserGroupObject
getgrav_grav
train
php
a185ff76fa1b35fa66df4015aa5a95508cf18107
diff --git a/markdown_include/include.py b/markdown_include/include.py index <HASH>..<HASH> 100644 --- a/markdown_include/include.py +++ b/markdown_include/include.py @@ -34,7 +34,7 @@ INC_SYNTAX = re.compile(r'\{!\s*(.+?)\s*!\}') class MarkdownInclude(Extension): - def __init__(self, configs={}): + def __init__(self, configs=[]): self.config = {'base_path': ['.', 'Location from which to evaluate relative paths for the include statement.'],} for key, value in configs.items(): self.setConfig(key, value) @@ -95,5 +95,5 @@ class IncludePreprocessor(Preprocessor): -def makeExtension(**kwargs): +def makeExtension(*args,**kwargs): return MarkdownInclude(kwargs)
Fixed to be more compatible with old versions of markdown.
cmacmackin_markdown-include
train
py
df57aea10f2772d96178b9da55f0718e830d9edd
diff --git a/src/test/org/openscience/cdk/io/MDLWriterTest.java b/src/test/org/openscience/cdk/io/MDLWriterTest.java index <HASH>..<HASH> 100644 --- a/src/test/org/openscience/cdk/io/MDLWriterTest.java +++ b/src/test/org/openscience/cdk/io/MDLWriterTest.java @@ -124,4 +124,21 @@ public class MDLWriterTest extends ChemObjectIOTest { String output = writer.toString(); Assert.assertEquals("Test for zero length pseudo atom label in MDL file", -1, output.indexOf("0.0000 0.0000 0.0000 0 0 0 0 0 0 0 0 0 0 0 0")); } + + @Test public void testNullFormalCharge() throws Exception { + StringWriter writer = new StringWriter(); + IMolecule molecule = builder.newMolecule(); + IAtom atom = builder.newAtom("C"); + atom.setFormalCharge(null); + molecule.addAtom(atom); + + MDLWriter mdlWriter = new MDLWriter(writer); + mdlWriter.write(molecule); + String output = writer.toString(); + // test ensures that the writer does not throw an exception on + // null formal charges, so a mere assert on output being non-zero + // length is enough + Assert.assertNotNull(output); + Assert.assertNotSame(0, output.length()); + } }
Added unit test for serialization of null formal charges into the MDL molfile format (which currently fails)
cdk_cdk
train
java
98ab3a30dcc997ee99d6c82b8e840638d4ce6950
diff --git a/src/Query/Joining/NestedQuery.php b/src/Query/Joining/NestedQuery.php index <HASH>..<HASH> 100644 --- a/src/Query/Joining/NestedQuery.php +++ b/src/Query/Joining/NestedQuery.php @@ -67,4 +67,24 @@ class NestedQuery implements BuilderInterface ) ]; } + + /** + * Returns nested query object. + * + * @return BuilderInterface + */ + public function getQuery() + { + return $this->query; + } + + /** + * Returns path this query is set for. + * + * @return string + */ + public function getPath() + { + return $this->path; + } }
Getter for nested query and path. (#<I>) * Getter for nested query. Currently there is not possibility to get query object when it is wrapped inside nested query. * Exposing path for nested query. * Removing not needed space.
ongr-io_ElasticsearchDSL
train
php
de30d773848c5a1297b264a68e7c3bbc9a924889
diff --git a/dashboard_app/models.py b/dashboard_app/models.py index <HASH>..<HASH> 100644 --- a/dashboard_app/models.py +++ b/dashboard_app/models.py @@ -358,10 +358,8 @@ class Bundle(models.Model): import_error.traceback = traceback.format_exc() import_error.save() else: - try: - self.deserialization_error.delete() - except BundleDeserializationError.DoesNotExist: - pass + if self.deserialization_error.exists(): + self.deserialization_error.get().delete() self.is_deserialized = True self.save() @@ -377,14 +375,16 @@ class BundleDeserializationError(models.Model): """ Model for representing errors encountered during bundle deserialization. There is one instance per bundle limit due to - OneToOneField. + unique = True. There used to be a OneToOne field but it didn't work + with databrowse application. The relevant logic for managing this is in the Bundle.deserialize() """ - bundle = models.OneToOneField( + bundle = models.ForeignKey( Bundle, primary_key = True, + unique = True, related_name = 'deserialization_error' )
Change BundleDeserializationError.bundle to be a ForeignKey relation. This works around django issue where OneToOneField behaves asymmetrically (raising DoesNotExist from one side and returning None from another). Unfortunately this behaviour caused databrowse application to crash when accessing most important model we have, the bundle. As a workaround we use an unique ForeignKey and change the API a little bit to account for the extra get() all required.
zyga_json-schema-validator
train
py
ae7609b8b270b7e3c7303a71298c968ea73ee4ab
diff --git a/salt/states/mount.py b/salt/states/mount.py index <HASH>..<HASH> 100644 --- a/salt/states/mount.py +++ b/salt/states/mount.py @@ -699,7 +699,8 @@ def unmounted(name, device=None, config='/etc/fstab', persist=False, - user=None): + user=None, + **kwargs): ''' .. versionadded:: 0.17.0
Also add **kwargs to unmounted, same story
saltstack_salt
train
py
6f4440215660b3eddf154853260778c88fe62031
diff --git a/packages/ember/tests/routing/basic_test.js b/packages/ember/tests/routing/basic_test.js index <HASH>..<HASH> 100644 --- a/packages/ember/tests/routing/basic_test.js +++ b/packages/ember/tests/routing/basic_test.js @@ -2106,7 +2106,7 @@ QUnit.test('Application template does not duplicate when re-rendered', function( // should cause application template to re-render handleURL('/posts'); - equal(jQuery('h3:contains(I Render Once)').size(), 1); + equal(jQuery('h3:contains(I Render Once)').length, 1); }); QUnit.test('Child routes should render inside the application template if the application template causes a redirect', function() {
Use `length` instead of `size()` against jQuery's object `jQuery#size()` is deprecated in jQuery <I> and removed in jQuery <I>. ref: <URL>
emberjs_ember.js
train
js
5a7833ba242bd6cd3d617f7b36413f7a60a9d3f8
diff --git a/python/sparknlp/__init__.py b/python/sparknlp/__init__.py index <HASH>..<HASH> 100644 --- a/python/sparknlp/__init__.py +++ b/python/sparknlp/__init__.py @@ -38,9 +38,6 @@ def start(include_ocr=False): .master("local[*]") \ .config("spark.driver.memory", "6G") \ .config("spark.serializer", "org.apache.spark.serializer.KryoSerializer") \ - .config("spark.kryoserializer.buffer.max", "600M") - - if include_ocr: builder \
Remove user's specific Spark config Some Spark configs must be up to users and not set by the library
JohnSnowLabs_spark-nlp
train
py
d8c62ddd18c7d02b5c4b4595e97652da7b8f6620
diff --git a/src/main/java/com/asana/OAuthApp.java b/src/main/java/com/asana/OAuthApp.java index <HASH>..<HASH> 100644 --- a/src/main/java/com/asana/OAuthApp.java +++ b/src/main/java/com/asana/OAuthApp.java @@ -31,12 +31,17 @@ public class OAuthApp public OAuthApp(String apiKey, String apiSecret, String redirectUri, String accessToken) { + this(apiKey, apiSecret, redirectUri, accessToken, HTTP_TRANSPORT, JSON_FACTORY); + } + + public OAuthApp(String apiKey, String apiSecret, String redirectUri, String accessToken, HttpTransport transport, JsonFactory jsonFactory) + { this.redirectUri = redirectUri; this.flow = new AuthorizationCodeFlow.Builder( BearerToken.authorizationHeaderAccessMethod(), - HTTP_TRANSPORT, - JSON_FACTORY, + transport, + jsonFactory, new GenericUrl(TOKEN_SERVER_URL), new ClientParametersAuthentication(apiKey, apiSecret), apiKey, @@ -48,7 +53,8 @@ public class OAuthApp .setAccessToken(accessToken); } } - + + public boolean isAuthorized() { return this.credential != null;
add constructor to allow HttpTransport and JsonFactory to be injected into OAuthApp
Asana_java-asana
train
java
af7208762f71780032a7bf71958a70aeafe50c02
diff --git a/raiden/raiden_event_handler.py b/raiden/raiden_event_handler.py index <HASH>..<HASH> 100644 --- a/raiden/raiden_event_handler.py +++ b/raiden/raiden_event_handler.py @@ -218,7 +218,7 @@ def handle_contract_send_channelclose( ) log.info(msg) except ChannelOutdatedError as e: - log.error(e.args) + log.error(str(e)) def handle_contract_send_channelupdate( @@ -247,7 +247,7 @@ def handle_contract_send_channelupdate( our_signature, ) except ChannelOutdatedError as e: - log.error(e.args) + log.error(str(e)) def handle_contract_send_channelunlock( @@ -261,7 +261,7 @@ def handle_contract_send_channelunlock( try: channel.unlock(channel_unlock_event.merkle_treee_leaves) except ChannelOutdatedError as e: - log.error(e.args) + log.error(str(e)) def handle_contract_send_channelsettle( @@ -328,7 +328,7 @@ def handle_contract_send_channelsettle( # at the same time. log.error('settle failed', reason=str(e)) except ChannelOutdatedError as e: - log.error(e.args) + log.error(str(e)) def on_raiden_event(raiden: RaidenService, event: Event):
Fix the way ChannelOutdatedError is being logged
raiden-network_raiden
train
py
6d798d5d29b27aff1ac582ee149ea38a2c2c98b5
diff --git a/example_project/polls/admin.py b/example_project/polls/admin.py index <HASH>..<HASH> 100644 --- a/example_project/polls/admin.py +++ b/example_project/polls/admin.py @@ -18,7 +18,8 @@ class ChoiceAdmin(DjangoObjectActions, admin.ModelAdmin): increment_vote.short_description = "+1" increment_vote.label = "vote++" increment_vote.attrs = { - 'test': 'foo', + 'test': '"foo&bar"', + 'Robert': '"); DROP TABLE Students; ', # 327 'class': 'addlink', }
make sure it renders attrs escaped
crccheck_django-object-actions
train
py
816a3a3dc5d0fc759546dcc2c6a01c9e9e98a611
diff --git a/packages/orbit-components/src/Card/components/CardWrapper/index.js b/packages/orbit-components/src/Card/components/CardWrapper/index.js index <HASH>..<HASH> 100644 --- a/packages/orbit-components/src/Card/components/CardWrapper/index.js +++ b/packages/orbit-components/src/Card/components/CardWrapper/index.js @@ -83,6 +83,10 @@ const StyledCardWrapper = styled.div` outline: 0; background: ${({ theme }) => theme.orbit.paletteWhiteHover}; } + + &:hover { + background: ${({ theme, onClick }) => onClick && theme.orbit.paletteWhiteHover}; + } `; StyledCardWrapper.defaultProps = {
fix(CardSection): missing hover (#<I>)
kiwicom_orbit-components
train
js
7635678a37271917d35b9e76c4fc484febc7df99
diff --git a/index.js b/index.js index <HASH>..<HASH> 100755 --- a/index.js +++ b/index.js @@ -100,7 +100,7 @@ var client = (function createTumblrClient() { var getRequest = client.getRequest; client.getRequest = function(apiPath, params, callback) { if (callback) { - return getRequest(apiPath, params, callback); + return getRequest.call(this, apiPath, params, callback); } var queryString = qs.stringify(params); @@ -122,7 +122,7 @@ var client = (function createTumblrClient() { var postRequest = client.postRequest; client.postRequest = function(apiPath, params, callback) { if (callback) { - return getRequest(apiPath, params, callback); + return postRequest.call(this, apiPathß, params, callback); } var requestMessage = 'POST ' + apiPath;
fix calls to get/postRequest when there's a callback
tumblr_tumblr-repl
train
js
461a582896dbb3848b4d7ffdc3d3313c7b3ece9f
diff --git a/addon/system/file.js b/addon/system/file.js index <HASH>..<HASH> 100644 --- a/addon/system/file.js +++ b/addon/system/file.js @@ -163,7 +163,9 @@ export default Ember.Object.extend({ read(options = { as: 'data-url' }) { let file = get(this, 'file').getSource(); + /*jshint -W055 */ let reader = new mOxieFileReader(); + /*jshint +W055 */ let { promise, resolve, reject } = RSVP.defer(); reader.onloadend = resolve; reader.onerror = reject;
disable jshint for mOxie class
adopted-ember-addons_ember-file-upload
train
js
453d4ce2d98ebaf3cbbd017ed71212205b17621c
diff --git a/codenerix/views.py b/codenerix/views.py index <HASH>..<HASH> 100644 --- a/codenerix/views.py +++ b/codenerix/views.py @@ -3222,7 +3222,7 @@ class GenModify(object): # Append to the general list of fields for group in formobj.get_groups(): for mainfield in group.get("fields", []): - for field in [mainfield]+mainfield.get("fields", []): + for field in [mainfield] + mainfield.get("fields", []): # Get the input inp = field.get("input") @@ -3244,6 +3244,9 @@ class GenModify(object): elif type(inpvalue) == datetime.time: # Convert datetime to string inpvalue = inpvalue.strftime(formats.get_format('TIME_INPUT_FORMATS', lang=self.language)[0]) + elif isinstance(inpvalue, Decimal): + # Convert Decimal to float + inpvalue = float(inpvalue) if not json_details: fields[inp.html_name] = inpvalue
Improvement in get_context_json. Convert Decimal to float
codenerix_django-codenerix
train
py
2fe3407bf22fb1563f76f363392fdb354f5f0d34
diff --git a/doc/conf.py b/doc/conf.py index <HASH>..<HASH> 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -55,7 +55,7 @@ author = u'Victor Stinner' # built documents. # # The short X.Y version. -version = release = '0.7.5' +version = release = '0.7.6' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/perf/__init__.py b/perf/__init__.py index <HASH>..<HASH> 100644 --- a/perf/__init__.py +++ b/perf/__init__.py @@ -10,7 +10,7 @@ import six import statistics # Python 3.4+, or backport on Python 2.7 -__version__ = '0.7.5' +__version__ = '0.7.6' # Format format history: # 4 - warmups are now a lists of (loops, raw_sample) rather than lists of diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ # - git commit -a -m "post-release" # - git push -VERSION = '0.7.5' +VERSION = '0.7.6' DESCRIPTION = 'Python module to generate and modify perf' CLASSIFIERS = [
post release: set version to <I>
vstinner_perf
train
py,py,py
1ad9c385b5e4245db90dbb674f61a7abd3c5fcfe
diff --git a/lib/xcore.js b/lib/xcore.js index <HASH>..<HASH> 100644 --- a/lib/xcore.js +++ b/lib/xcore.js @@ -235,7 +235,9 @@ XClient.prototype.AllocID = function() XClient.prototype.unpackEvent = function(type, seq, extra, code, raw) { var event = {}; // TODO: constructor & base functions - event.type = type; + // Remove the most significant bit. See Chapter 1, Event Format section in X11 protocol + // specification + event.type = type && 0x7F; event.seq = seq; var extUnpacker = this.eventParsers[type];
Fix the parsing of the type field in Event msgs - According to the standard, the most significant bit of the 8-bit type code is used to flag if the event was generated from a SendEvent request. See Event Format section in Chapter 1 of the specification.
sidorares_node-x11
train
js
f28168e664d43b7ba724e853413f7d16aee0482d
diff --git a/lib/data_structures/action_links.rb b/lib/data_structures/action_links.rb index <HASH>..<HASH> 100644 --- a/lib/data_structures/action_links.rb +++ b/lib/data_structures/action_links.rb @@ -9,7 +9,8 @@ module ActiveScaffold::DataStructures # adds an ActionLink, creating one from the arguments if need be def add(action, options = {}) link = action.is_a?(ActiveScaffold::DataStructures::ActionLink) ? action : ActiveScaffold::DataStructures::ActionLink.new(action, options) - @set << link unless @set.any? {|a| a.action == link.action and a.parameters == link.parameters} + # NOTE: this duplicate check should be done by defining the comparison operator for an Action data structure + @set << link unless @set.any? {|a| a.action == link.action and a.controller == link.controller and a.parameters == link.parameters} end alias_method :<<, :add
the ActionLinks object now compares controller as well as action and parameters when determining whether the link is a duplicate. closes issue #<I>. git-svn-id: <URL>
activescaffold_active_scaffold
train
rb
a43d0898599896c9e8d96b88f0de6ee76440cb33
diff --git a/packages/puppeteer-extra-plugin-stealth/evasions/navigator.webdriver/index.js b/packages/puppeteer-extra-plugin-stealth/evasions/navigator.webdriver/index.js index <HASH>..<HASH> 100644 --- a/packages/puppeteer-extra-plugin-stealth/evasions/navigator.webdriver/index.js +++ b/packages/puppeteer-extra-plugin-stealth/evasions/navigator.webdriver/index.js @@ -16,13 +16,17 @@ class Plugin extends PuppeteerExtraPlugin { } async onPageCreated(page) { - // Chrome returns undefined, Firefox false await page.evaluateOnNewDocument(() => { - // eslint-disable-next-line - const newProto = navigator.__proto__ - delete newProto.webdriver - // eslint-disable-next-line - navigator.__proto__ = newProto + Object.defineProperty(window, "navigator", { + value: new Proxy(navigator, { + has: (target, key) => (key === 'webdriver') + ? false + : key in target, + get: (target, key, receiver) => (key === 'webdriver') + ? undefined + : target[key], + }) + }); }) } }
Add improved navigator.webdriver evasion (#<I>) Now works with very advanced instanceof test.
berstend_puppeteer-extra
train
js
f61366643d7e36eb80ecd2d946a4a7c8bfbf9714
diff --git a/src/blocks/scratch3_pen.js b/src/blocks/scratch3_pen.js index <HASH>..<HASH> 100644 --- a/src/blocks/scratch3_pen.js +++ b/src/blocks/scratch3_pen.js @@ -382,8 +382,8 @@ class Scratch3PenBlocks { */ changePenTransparencyBy (args, util) { const penState = this._getPenState(util.target); - - penState.penAttributes.color4f[3] = penState.penAttributes.color4f[3] + (args.TRANSPARENCY / 100); + const TRANSPARENCY = args.TRANSPARENCY / 100; + penState.penAttributes.color4f[3] = penState.penAttributes.color4f[3] + TRANSPARENCY; this._updatePenColor(penState); } @@ -395,8 +395,8 @@ class Scratch3PenBlocks { */ setPenTransparencyTo (args, util) { const penState = this._getPenState(util.target); - - penState.penAttributes.color4f[3] = args.TRANSPARENCY / 100; + const TRANSPARENCY = MathUtil.clamp(args.TRANSPARENCY, 0, 100) / 100; + penState.penAttributes.color4f[3] = TRANSPARENCY; this._updatePenColor(penState); } }
Clamp transparency value (at least for set)
LLK_scratch-vm
train
js
c006adfe4e3d03ccba1a409c2629d093a8d71158
diff --git a/lib/waterline.js b/lib/waterline.js index <HASH>..<HASH> 100644 --- a/lib/waterline.js +++ b/lib/waterline.js @@ -282,7 +282,7 @@ Waterline.prototype.bootstrap = function bootstrap(cb) { // Run auto-migration strategies on each collection // async.each(toBeSynced, function(collection, next) { - async.eachSeries(toBeSynced, function(collection, next) { + async.each(toBeSynced, function(collection, next) { // async.eachLimit(toBeSynced, 9, function(collection, next) { collection.sync(next); }, cb);
improve initialize() performance - use async.each instead of eachSeries
balderdashy_waterline
train
js
ae8e78255194eab299ca29f0360f7cbda89b6398
diff --git a/cmd/swagger/commands/generate/spec.go b/cmd/swagger/commands/generate/spec.go index <HASH>..<HASH> 100644 --- a/cmd/swagger/commands/generate/spec.go +++ b/cmd/swagger/commands/generate/spec.go @@ -73,13 +73,13 @@ func loadSpec(input string) (*spec.Swagger, error) { } func writeToFile(swspec *spec.Swagger, pretty bool, output string) error { - var data []byte + var b []byte var err error if strings.HasSuffix(output, "yml") || strings.HasSuffix(output, "yaml") { - data, err = marshalToYAMLFormat(swspec) + b, err = marshalToYAMLFormat(swspec) } else { - data, err = marshalToJSONFormat(swspec, pretty) + b, err = marshalToJSONFormat(swspec, pretty) } if err != nil { @@ -87,10 +87,10 @@ func writeToFile(swspec *spec.Swagger, pretty bool, output string) error { } if output == "" { - fmt.Println(string(data)) + fmt.Println(string(b)) return nil } - return ioutil.WriteFile(output, data, 0644) + return ioutil.WriteFile(output, b, 0644) } func marshalToJSONFormat(swspec *spec.Swagger, pretty bool) ([]byte, error) {
rename data back to b to make it consistent with previous code
go-swagger_go-swagger
train
go
dc3b2476c4eb61c37424a1ca2f46859e4e6fcd81
diff --git a/callback_create.go b/callback_create.go index <HASH>..<HASH> 100644 --- a/callback_create.go +++ b/callback_create.go @@ -59,7 +59,7 @@ func createCallback(scope *Scope) { for _, field := range scope.Fields() { if scope.changeableField(field) { - if field.IsNormal { + if field.IsNormal && !field.IsIgnored { if field.IsBlank && field.HasDefaultValue { blankColumnsWithDefaultValue = append(blankColumnsWithDefaultValue, scope.Quote(field.DBName)) scope.InstanceSet("gorm:blank_columns_with_default_value", blankColumnsWithDefaultValue) diff --git a/scope.go b/scope.go index <HASH>..<HASH> 100644 --- a/scope.go +++ b/scope.go @@ -907,7 +907,7 @@ func (scope *Scope) updatedAttrsWithValues(value interface{}) (results map[strin results[field.DBName] = value } else { err := field.Set(value) - if field.IsNormal { + if field.IsNormal && !field.IsIgnored { hasUpdate = true if err == ErrUnaddressable { results[field.DBName] = value
Don't save ignored fields into database
jinzhu_gorm
train
go,go
8095444ee0b1a53e77f46de3681a8322b159cb41
diff --git a/news-bundle/contao/config/config.php b/news-bundle/contao/config/config.php index <HASH>..<HASH> 100644 --- a/news-bundle/contao/config/config.php +++ b/news-bundle/contao/config/config.php @@ -18,7 +18,9 @@ array_insert($GLOBALS['BE_MOD']['content'], 1, array ( 'news' => array ( - 'tables' => array('tl_news_archive', 'tl_news', 'tl_news_feed', 'tl_content') + 'tables' => array('tl_news_archive', 'tl_news', 'tl_news_feed', 'tl_content'), + 'table' => array('TableWizard', 'importTable'), + 'list' => array('ListWizard', 'importList') ) ));
[News] Register the CSV import in the news and calendar modules (see #<I>)
contao_contao
train
php
e9f0b08520b0b30c4344bcc09a73937511711783
diff --git a/spec/unit/type/component_spec.rb b/spec/unit/type/component_spec.rb index <HASH>..<HASH> 100755 --- a/spec/unit/type/component_spec.rb +++ b/spec/unit/type/component_spec.rb @@ -42,6 +42,10 @@ describe component do component.new(:name => "Class[foo]").pathbuilder.must == ["Foo"] end + it "should produce the class name even for the class named main" do + component.new(:name => "Class[main]").pathbuilder.must == ["Main"] + end + it "should produce a resource reference if the component does not model a class" do component.new(:name => "Foo[bar]").pathbuilder.must == ["Foo[bar]"] end
(#<I>) Add a spec test asserting that main is treated like other classes
puppetlabs_puppet
train
rb
24f70e6548f9e787fc81b1df1378197332fd75c9
diff --git a/lib/local/platform/windows.js b/lib/local/platform/windows.js index <HASH>..<HASH> 100644 --- a/lib/local/platform/windows.js +++ b/lib/local/platform/windows.js @@ -36,7 +36,8 @@ module.exports = { pathQuery: 'dir /s /b iexplore.exe', cwd: cwd }, - phantomjs: { + phantom: { + defaultLocation: path.join(programFiles, 'phantomjs', 'phantomjs.exe'), pathQuery: 'dir /s /b phantomjs.exe', args: [path.join(__dirname, '..', '..', '..', 'resources/phantom.js')], multi: true,
Fixing PhantomJS name and setting default location for Windows.
bitovi_launchpad
train
js
4aebb58dedee68fe9c46f8cc47376f09073a4819
diff --git a/lib/phpmailer/class.phpmailer.php b/lib/phpmailer/class.phpmailer.php index <HASH>..<HASH> 100644 --- a/lib/phpmailer/class.phpmailer.php +++ b/lib/phpmailer/class.phpmailer.php @@ -1690,9 +1690,10 @@ class PHPMailer { * @author Marcus Bointon */ public function EncodeQP($string, $line_max = 76, $space_conv = false) { - if (function_exists('quoted_printable_encode')) { //Use native function if it's available (>= PHP5.3) - return quoted_printable_encode($string); - } + //MDL-23240 php's implementation causes problems for some users + //if (function_exists('quoted_printable_encode')) { //Use native function if it's available (>= PHP5.3) + // return quoted_printable_encode($string); + //} $filters = stream_get_filters(); if (!in_array('convert.*', $filters)) { //Got convert stream filter? return $this->EncodeQPphp($string, $line_max, $space_conv); //Fall back to old implementation
email MDL-<I> commented out the use of php's quoted_printable_encode()
moodle_moodle
train
php
fcdf2dd4359fea96cc06af5556a02631330ce559
diff --git a/lib/edit/edit_command.js b/lib/edit/edit_command.js index <HASH>..<HASH> 100644 --- a/lib/edit/edit_command.js +++ b/lib/edit/edit_command.js @@ -4,7 +4,6 @@ const { inspect } = require('util') const { red } = require('chalk') const parseObjectValue = require('./parse_object_value') const split = require('split') -const through = require('through') module.exports = (section, action) => { const name = `${action}-${section}` @@ -91,7 +90,7 @@ const runInBatch = (section, action) => { let counter = 0 process.stdin .pipe(split()) - .pipe(through(async function (line) { + .on('data', async function (line) { line = line.trim() if (line === '') return this.pause() @@ -99,7 +98,7 @@ const runInBatch = (section, action) => { const lineArgs = getArgsFromBatchLine(line) await runOnce(section, action, lineArgs) this.resume() - })) + }) .on('close', () => { process.stderr.write(`done processing ${counter} lines\n`) })
edit_command: batch mode: refactor without 'through'
maxlath_wikidata-cli
train
js
c2e0320d2a4790725ab29b14536e37a0a10b3b12
diff --git a/lib/whenever.rb b/lib/whenever.rb index <HASH>..<HASH> 100644 --- a/lib/whenever.rb +++ b/lib/whenever.rb @@ -1,14 +1,5 @@ require 'chronic' -# Hoping to load Rails' Rakefile -begin - load 'Rakefile' -rescue LoadError - nil -end - -# If Rails' rakefile was loaded than so was active_support, but -# if this is being used in a non-rails enviroment we need to require it. # It was previously defined as a dependency of this gem, but that became # problematic. See: http://github.com/javan/whenever/issues#issue/1 begin diff --git a/lib/whenever/base.rb b/lib/whenever/base.rb index <HASH>..<HASH> 100644 --- a/lib/whenever/base.rb +++ b/lib/whenever/base.rb @@ -5,11 +5,7 @@ module Whenever end def self.path - if defined?(Rails) - Rails.root.to_s - elsif defined?(::Rails) - ::Rails.root.to_s - end + Dir.pwd end end \ No newline at end of file
use Dir.pwd as default path instead of loading Rails and getting the Rails.root
javan_whenever
train
rb,rb
fd6480311c6d872b0a921ea3ec8a1cdffd85d3ce
diff --git a/examples/py/cli.py b/examples/py/cli.py index <HASH>..<HASH> 100644 --- a/examples/py/cli.py +++ b/examples/py/cli.py @@ -5,6 +5,7 @@ import os import re import sys import json +import platform from pprint import pprint # ------------------------------------------------------------------------------ @@ -18,6 +19,11 @@ import ccxt # noqa: E402 # ------------------------------------------------------------------------------ +print('Python Version:', platform.python_version()) +print('CCXT Version:', ccxt.__version__) + +# ------------------------------------------------------------------------------ + class Argv(object):
cli.py print out version numbers
ccxt_ccxt
train
py
de694dfeb93a371cd5b4b4f822ec94c6cc850b91
diff --git a/tests/ui-tests/tests/console-basic-test.js b/tests/ui-tests/tests/console-basic-test.js index <HASH>..<HASH> 100644 --- a/tests/ui-tests/tests/console-basic-test.js +++ b/tests/ui-tests/tests/console-basic-test.js @@ -177,9 +177,6 @@ describe('Console basic tests', () => { '[data-e2e-id=application-name]', config.testApp, ); - frame.waitForXPath(`//td[contains(string(), "${config.testApp}")]`); - frame.waitForXPath(`//h1[contains(string(), "General Information")]`); - frame.waitForSelector('.fd-breadcrumb__link'); frame.click('.fd-breadcrumb__link'); });
Remove old code from ui tests (#<I>)
kyma-project_console
train
js
dc41eb90b54abc7011fe9b98610168d0ed91f312
diff --git a/src/com/aoindustries/servlet/filter/TrimFilterWriter.java b/src/com/aoindustries/servlet/filter/TrimFilterWriter.java index <HASH>..<HASH> 100755 --- a/src/com/aoindustries/servlet/filter/TrimFilterWriter.java +++ b/src/com/aoindustries/servlet/filter/TrimFilterWriter.java @@ -24,6 +24,7 @@ package com.aoindustries.servlet.filter; import com.aoindustries.util.BufferManager; import java.io.PrintWriter; +import java.io.Writer; import java.util.Locale; import javax.servlet.ServletResponse;
Now using parent implementation of PrintWriter instead of wrapping a different one.
aoindustries_aocode-public
train
java
00ab6d9d471ccaa4a66395e747eadb6eeb5dd3f5
diff --git a/pkg/graphdb/conn_sqlite3.go b/pkg/graphdb/conn_sqlite3.go index <HASH>..<HASH> 100644 --- a/pkg/graphdb/conn_sqlite3.go +++ b/pkg/graphdb/conn_sqlite3.go @@ -1,3 +1,5 @@ +// +build cgo + package graphdb import "database/sql"
Fix a daemon build error when cgo isn't available Avoid duplicate definitions of NewSqliteConn when cgo isn't enabled, so that we can at least build the daemon.
moby_moby
train
go
90779f79914b0a5b3580419bb260781c67a415b6
diff --git a/src/com/google/javascript/jscomp/DefaultPassConfig.java b/src/com/google/javascript/jscomp/DefaultPassConfig.java index <HASH>..<HASH> 100644 --- a/src/com/google/javascript/jscomp/DefaultPassConfig.java +++ b/src/com/google/javascript/jscomp/DefaultPassConfig.java @@ -3341,6 +3341,11 @@ public final class DefaultPassConfig extends PassConfig { protected CompilerPass create(final AbstractCompiler compiler) { return new J2clSourceFileChecker(compiler); } + + @Override + protected FeatureSet featureSet() { + return FeatureSet.latest(); + } }; private final PassFactory j2clChecksPass =
J2clSourceFileChecker just looks at filenames, it is compatible with all compilations modes. ------------- Created by MOE: <URL>
google_closure-compiler
train
java
543f03c0241133f4c6968e9e1eb84cd57a67c6c1
diff --git a/tests/test_service.py b/tests/test_service.py index <HASH>..<HASH> 100755 --- a/tests/test_service.py +++ b/tests/test_service.py @@ -109,7 +109,20 @@ class ServiceTestCase(testlib.SDKTestCase): def test_query_without_login(self): service = self._create_unauthenticated_service() + + # Ensure raises AuthenticationError self.assertRaises(AuthenticationError, lambda: service.indexes.list()) + + # Ensure raises HTTPError 401 + try: + service.indexes.list() + self.fail('Expected HTTP 401.') + except HTTPError as he: + if he.code == 401: + # Good + pass + else: + raise def test_server_info_without_login(self): service = self._create_unauthenticated_service()
Test that AuthenticationError is an HTTPError.
splunk_splunk-sdk-python
train
py
bf339d28c29662e599bc1df189bcc5a0edede62d
diff --git a/index.js b/index.js index <HASH>..<HASH> 100644 --- a/index.js +++ b/index.js @@ -1,20 +1,31 @@ 'use strict' -var formatter = require('./lib/node-0.10-formatter') +const formatter = require('./lib/node-0.10-formatter') -var orig = Error.prepareStackTrace -Error.prepareStackTrace = function (err, callsites) { +let lastPrepareStackTrace = Error.prepareStackTrace + +Object.defineProperty(Error, 'prepareStackTrace', { + configurable: true, + enumerable: true, + get: function () { + return prepareStackTrace + }, + set: function (fn) { + lastPrepareStackTrace = fn + } +}) + +module.exports = function (err) { + err.stack + return err.__error_callsites +} + +function prepareStackTrace (err, callsites) { Object.defineProperty(err, '__error_callsites', { enumerable: false, configurable: true, writable: false, value: callsites }) - - return (orig || formatter)(err, callsites) -} - -module.exports = function (err) { - err.stack - return err.__error_callsites + return (lastPrepareStackTrace || formatter)(err, callsites) }
feat: support overwriting of Error.prepareStacktrace Previously, if the `Error.prepareStacktrace` function was overwritten after this module was loaded, we would loose the ability to set the magic `__error_callsites` property. With this commit, we'll always ensure to run our `prepareStacktrace` function before any other function added later.
watson_error-callsites
train
js
cc495c5cab1c90c226abf99bae45b93d829767fb
diff --git a/packages/embark-ui/src/components/TextEditorToolbar.js b/packages/embark-ui/src/components/TextEditorToolbar.js index <HASH>..<HASH> 100644 --- a/packages/embark-ui/src/components/TextEditorToolbar.js +++ b/packages/embark-ui/src/components/TextEditorToolbar.js @@ -89,7 +89,6 @@ class TextEditorToolbar extends Component { {this.state.successMessage && <StatusText message={this.state.successMessage} icon="check"/>} {this.props.editorOperationStatus.loading && <StatusText message="Processing..." icon="spinner" spin={true}/>} {this.props.editorOperationStatus.error && <StatusText message={this.props.editorOperationStatus.error} icon="exclamation-triangle"/>} - <StatusText message="Error while processing Error message here" icon="exclamation-triangle"/> </li> <li className="breadcrumb-menu"> <Nav className="btn-group">
hotfix(cockpit/editor): remove test alert
embark-framework_embark
train
js
64a7cc505201ed727b92406e6c7d9a37b2129449
diff --git a/src/Request/RequestOptions.php b/src/Request/RequestOptions.php index <HASH>..<HASH> 100644 --- a/src/Request/RequestOptions.php +++ b/src/Request/RequestOptions.php @@ -102,6 +102,16 @@ class RequestOptions return $this; } + public function addPostParams($params = []) + { + foreach($params as $k => $v) + { + $this->addPostParam($k, $v); + } + + return $this; + } + /** * Set a search term for the request
Added setter for multiple params
phrest_sdk
train
php
3b932663a85eb2f23d7ef248eb2b6f610b252779
diff --git a/lib/memcache_check/server.rb b/lib/memcache_check/server.rb index <HASH>..<HASH> 100644 --- a/lib/memcache_check/server.rb +++ b/lib/memcache_check/server.rb @@ -14,6 +14,7 @@ module MemcacheCheck end def benchmark(num_times) + test_run @time = Benchmark.measure do num_times.times do run_test @@ -35,6 +36,15 @@ module MemcacheCheck end end + def test_run + key, value = Utils.generate_key_value_pair + begin + set(key, value) + get(key) + rescue + end + end + def set(key, value) @memcache_client.set(key, value) end diff --git a/lib/memcache_check/version.rb b/lib/memcache_check/version.rb index <HASH>..<HASH> 100644 --- a/lib/memcache_check/version.rb +++ b/lib/memcache_check/version.rb @@ -1,3 +1,3 @@ module MemcacheCheck - VERSION = "0.1.4" + VERSION = "0.1.5" end
Add pre-benchmark test_run so that benchmark numbers aren't skewed by first run.
mikeadmire_memcache_check
train
rb,rb
208199ba85b742d1470c6b7b0deca0dda5bfc559
diff --git a/pkg/instancegroups/instancegroups.go b/pkg/instancegroups/instancegroups.go index <HASH>..<HASH> 100644 --- a/pkg/instancegroups/instancegroups.go +++ b/pkg/instancegroups/instancegroups.go @@ -491,9 +491,8 @@ func (c *RollingUpdateCluster) validateClusterWithTimeout(validateCount int, gro func hasFailureRelevantToGroup(failures []*validation.ValidationError, group *cloudinstances.CloudInstanceGroup) bool { // Ignore non critical validation errors in other instance groups like below target size errors for _, failure := range failures { - // Determining InstanceGroups for certain resources like Pods, ComponentStatus is not straightforward. - // Till we are able to determine the InstanceGroups for these resources without ambiguity, the - // InstanceGroup field of the ValidationErrors for these resources will be nil + // Certain failures like a system-critical-pod failure and dns server related failures + // set their InstanceGroup to nil, since we cannot associate the failure to any one group if failure.InstanceGroup == nil { return true }
instancegroups: Clear out the TODO comment Now that we are able to associate pod validation failures with the instance groups. We can remove the TODO comment
kubernetes_kops
train
go
2c52bc303f66389d88a820388b81208e30c75dc0
diff --git a/camel-bulldog/src/main/java/io/silverspoon/I2cProducer.java b/camel-bulldog/src/main/java/io/silverspoon/I2cProducer.java index <HASH>..<HASH> 100644 --- a/camel-bulldog/src/main/java/io/silverspoon/I2cProducer.java +++ b/camel-bulldog/src/main/java/io/silverspoon/I2cProducer.java @@ -70,14 +70,15 @@ public class I2cProducer extends BulldogProducer { } final int length = getEndpoint().getReadLength(); final byte[] buffer = new byte[length]; - if (log.isDebugEnabled()) { - log.debug("Initializing I2C connection to address: " + address); + if (log.isTraceEnabled()) { + log.trace("Initializing I2C connection to address: " + address); } synchronized (i2cAccessLock) { final I2cConnection connection = i2c.createI2cConnection(Byte.decode(address)); try { byte[] requestBuffer = new byte[msg.length() / 2]; + if (log.isTraceEnabled()) { log.trace("Preparing I2C message"); }
[camel-bulldog] Updated logging in I2cProducer.
SilverThings_silverspoon
train
java
716668486c992af9fcff4adcacc3554f6e2080d0
diff --git a/test/helpers/fixture_deploy_helper.rb b/test/helpers/fixture_deploy_helper.rb index <HASH>..<HASH> 100644 --- a/test/helpers/fixture_deploy_helper.rb +++ b/test/helpers/fixture_deploy_helper.rb @@ -47,10 +47,6 @@ module FixtureDeployHelper def deploy_dir_without_profiling(dir, wait: true, allow_protected_ns: false, prune: true, bindings: {}, sha: nil) current_sha = sha || SecureRandom.hex(6) - version_info = { - kube_client_version: KubernetesDeploy::IntegrationTest::KUBE_CLIENT_VERSION, - kube_server_version: KubernetesDeploy::IntegrationTest::KUBE_SERVER_VERSION - } deploy = KubernetesDeploy::DeployTask.new( namespace: @namespace, current_sha: current_sha, @@ -58,7 +54,7 @@ module FixtureDeployHelper template_dir: dir, logger: logger, kubectl_instance: build_kubectl, - bindings: version_info.merge(bindings) + bindings: bindings ) deploy.run( verify_result: wait,
removed currently unused version info from bindings
Shopify_kubernetes-deploy
train
rb
5b3954892d79fc95df1cc826e4e0a45e505fb3a7
diff --git a/spyder/api/widgets/toolbars.py b/spyder/api/widgets/toolbars.py index <HASH>..<HASH> 100644 --- a/spyder/api/widgets/toolbars.py +++ b/spyder/api/widgets/toolbars.py @@ -53,6 +53,8 @@ class SpyderToolBar(QToolBar): self._section_items = OrderedDict() self._title = title + self.setWindowTitle(title) + def add_item(self, action_or_widget, section=None, before=None): """ Add action or widget item to given toolbar `section`. diff --git a/spyder/app/mainwindow.py b/spyder/app/mainwindow.py index <HASH>..<HASH> 100644 --- a/spyder/app/mainwindow.py +++ b/spyder/app/mainwindow.py @@ -1581,6 +1581,10 @@ class MainWindow(QMainWindow): logger.info("*** End of MainWindow setup ***") self.is_starting_up = False + for plugin, plugin_instance in self._EXTERNAL_PLUGINS.items(): + self.tabify_plugin(plugin_instance) + plugin_instance.toggle_view(False) + def setup_menus(self): """Setup menus.""" # Update menus list
Fix toolbar title and tabify of external plugins
spyder-ide_spyder
train
py,py
42aa03541291cfcedf4ca8cc178f19b26bdd330a
diff --git a/tooling/util/coverage.js b/tooling/util/coverage.js index <HASH>..<HASH> 100644 --- a/tooling/util/coverage.js +++ b/tooling/util/coverage.js @@ -76,9 +76,8 @@ async function combine(packageName) { async function report() { const collector = new Collector(); const pattern = `reports/coverage/**/*.json`; - const files = await g(pattern, { - ignore: `legacy/**` - }); + await rimraf(`reports/coverage/legacy`); + const files = await g(pattern); for (const f of files) { collector.add(JSON.parse(await fs.readFile(f))); }
fix(tooling): do not include legacy in code coverage
webex_spark-js-sdk
train
js
df314ead849d7a66a9ef5c79918c459e7811fc6c
diff --git a/web/api/query.go b/web/api/query.go index <HASH>..<HASH> 100644 --- a/web/api/query.go +++ b/web/api/query.go @@ -43,13 +43,13 @@ func setAccessControlHeaders(w http.ResponseWriter) { func parseTimestampOrNow(t string) (clientmodel.Timestamp, error) { if t == "" { return clientmodel.Now(), nil - } else { - tFloat, err := strconv.ParseFloat(t, 64) - if err != nil { - return 0, err - } - return clientmodel.TimestampFromUnixNano(int64(tFloat * float64(time.Second/time.Nanosecond))), nil } + + tFloat, err := strconv.ParseFloat(t, 64) + if err != nil { + return 0, err + } + return clientmodel.TimestampFromUnixNano(int64(tFloat * float64(time.Second/time.Nanosecond))), nil } func parseDuration(d string) (time.Duration, error) {
Remove unnecessary "else" branch in query API.
prometheus_prometheus
train
go
9a3225da435d3adb3253cc02723e3e67d06462c5
diff --git a/abilian/web/admin/panels/sysinfo.py b/abilian/web/admin/panels/sysinfo.py index <HASH>..<HASH> 100644 --- a/abilian/web/admin/panels/sysinfo.py +++ b/abilian/web/admin/panels/sysinfo.py @@ -6,6 +6,7 @@ from __future__ import absolute_import, print_function, division import os import sys import pkg_resources +import pip from pip.vcs import vcs from pathlib import Path @@ -37,8 +38,15 @@ class SysinfoPanel(AdminPanel): vcs_name = vcs.get_backend_name(location) if vcs_name: - vc = vcs.get_backend_from_location(location)() - url, revision = vc.get_info(location) + vc = vcs.get_backend(vcs_name)() + try: + url = vc.get_url(location) + except pip.exceptions.InstallationError: + url = 'None' + try: + revision = vc.get_revision(location) + except pip.exceptions.InstallationError: + revision = 'None' package['vcs'] = dict(name=vcs_name, url=url, revision=revision) packages.append(package)
fix when package has no git remote repository
abilian_abilian-core
train
py
fb5dd81c9d0afc37ebd74090576068b192fb1f36
diff --git a/src/components/player.js b/src/components/player.js index <HASH>..<HASH> 100644 --- a/src/components/player.js +++ b/src/components/player.js @@ -12,7 +12,7 @@ import Loader from './loader' import PlayerInfo from './player_info' import $ from 'clappr-zepto' -const baseUrl = currentScriptUrl().replace(/\/[^\/]+$/, '') +const baseUrl = currentScriptUrl().replace(/\/[^/]+$/, '') /** * @class Player
style(player): remove unnecessary escape character
clappr_clappr
train
js
d17d8c8977b04ca4674823873ad4454e9be5b34c
diff --git a/easyaudit/signals.py b/easyaudit/signals.py index <HASH>..<HASH> 100644 --- a/easyaudit/signals.py +++ b/easyaudit/signals.py @@ -118,7 +118,6 @@ def m2m_changed(sender, instance, action, reverse, model, pk_set, using, **kwarg crud_event.save() except Exception: logger.exception('easy audit had an m2m-changed exception.') - pass def post_delete(sender, instance, using, **kwargs):
Remove extraneous `pass`
soynatan_django-easy-audit
train
py
4cedb4db03e1cbdef80f66a64d2b3df1788ad265
diff --git a/config/web.php b/config/web.php index <HASH>..<HASH> 100644 --- a/config/web.php +++ b/config/web.php @@ -38,6 +38,14 @@ $config = [ ], ], 'db' => require(__DIR__ . '/db.php'), + /* + 'urlManager' => [ + 'enablePrettyUrl' => true, + 'showScriptName' => false, + 'rules' => [ + ], + ], + */ ], 'params' => $params, ];
Added commented urlManager configuration example to config file
yiisoft_yii2-app-basic
train
php
edbc9c1d73612ff75c250574b3006005d3048c9b
diff --git a/pychromecast/socket_client.py b/pychromecast/socket_client.py index <HASH>..<HASH> 100644 --- a/pychromecast/socket_client.py +++ b/pychromecast/socket_client.py @@ -123,7 +123,7 @@ class SocketClient(threading.Thread): tries -= 1 else: self.stop.set() - self.logger.exception("Failed to connect. No retries.") + self.logger.error("Failed to connect. No retries.") raise ChromecastConnectionError("Failed to connect") self.register_handler(HeartbeatController())
Use logger.error rather than logger.exception.
balloob_pychromecast
train
py
8c327ab873f4ff6b71da97c68dd98f1338939146
diff --git a/lib/ripl/shell_commands.rb b/lib/ripl/shell_commands.rb index <HASH>..<HASH> 100644 --- a/lib/ripl/shell_commands.rb +++ b/lib/ripl/shell_commands.rb @@ -1,3 +1,5 @@ +require 'ripl' + require 'set' require 'shellwords'
Require ripl anyways.
postmodern_ripl-shell_commands
train
rb
4ad03988281461a83d9771506a96cca17c305b6c
diff --git a/src/components/text.js b/src/components/text.js index <HASH>..<HASH> 100644 --- a/src/components/text.js +++ b/src/components/text.js @@ -270,9 +270,9 @@ module.exports.Component = registerComponent('text', { var baseline; var el = this.el; var geometry = this.geometry; - var geometryComponent = el.getAttribute('geometry'); + var geometryComponent; var height; - var layout = geometry.layout; + var layout; var mesh = this.mesh; var textRenderWidth; var textScale; @@ -280,6 +280,8 @@ module.exports.Component = registerComponent('text', { var x; var y; + if (!geometry.layout) { return; } + // Determine width to use (defined width, geometry's width, or default width). geometryComponent = el.getAttribute('geometry'); width = data.width || (geometryComponent && geometryComponent.width) || DEFAULT_WIDTH; @@ -291,6 +293,7 @@ module.exports.Component = registerComponent('text', { textScale = width / textRenderWidth; // Determine height to use. + layout = geometry.layout; height = textScale * (layout.height + layout.descender); // Update geometry dimensions to match text layout if width and height are set to 0.
check geometry is set first in text updateLayout
aframevr_aframe
train
js
2338409dc7c027bfc95f8c4279dbb5367a268d82
diff --git a/app/modules/checkout/CheckoutController.js b/app/modules/checkout/CheckoutController.js index <HASH>..<HASH> 100644 --- a/app/modules/checkout/CheckoutController.js +++ b/app/modules/checkout/CheckoutController.js @@ -133,7 +133,9 @@ angular $scope.canProceed = function(){ return $scope.billingAddressForm.$valid && - (checkoutModel.addressEqual || $scope.shippingAddressForm.$valid); + (checkoutModel.addressEqual || $scope.shippingAddressForm.$valid) && + checkoutModel.selectedPaymentMethod && + checkoutModel.selectedPaymentMethod.method !== PAYPAL_EXPRESS_ID; }; $scope.proceed = function(){
fix(checkout): never allow to proceed with paypal in regular checkout
sofa_sofa-couch-service
train
js
a4090d0b30f850044413630333341cd327cbb55a
diff --git a/Auth/OpenID/FileStore.php b/Auth/OpenID/FileStore.php index <HASH>..<HASH> 100644 --- a/Auth/OpenID/FileStore.php +++ b/Auth/OpenID/FileStore.php @@ -482,7 +482,7 @@ class Auth_OpenID_FileStore extends Auth_OpenID_OpenIDStore { } if ($handle = opendir($dir)) { - while ($item = readdir($handle)) { + while (false !== ($item = readdir($handle))) { if (!in_array($item, array('.', '..'))) { if (is_dir($dir . $item)) {
loop over directories "the right way" See <URL>)) { echo "$entry\n"; } /* This is the WRONG way to loop over the directory. */ while ($entry = readdir($handle)) { echo "$entry\n"; } Looping over a directory the wrong way will cause the loop to stop if it comes to a directory named 0 (or anything else which evaluates to false)
openid_php-openid
train
php
8851fa670eecb4fb60d5a23a9d4b801f2759dcd1
diff --git a/test/test.js b/test/test.js index <HASH>..<HASH> 100644 --- a/test/test.js +++ b/test/test.js @@ -226,6 +226,27 @@ describe('csurf', function () { }) }) + it('should keep default cookie name when "key: undefined"', function (done) { + var server = createServer({ cookie: { key: undefined } }) + + request(server) + .get('/') + .expect(200, function (err, res) { + if (err) return done(err) + var data = cookie(res, '_csrf') + var token = res.text + + assert.ok(Boolean(data)) + assert.ok(/; *path=\/(?:;|$)/i.test(data)) + + request(server) + .post('/') + .set('Cookie', cookies(res)) + .set('X-CSRF-Token', token) + .expect(200, done) + }) + }) + describe('when "signed": true', function () { it('should enable signing', function (done) { var server = createServer({ cookie: { signed: true } })
tests: add test for cookie key: undefined
expressjs_csurf
train
js
4831992cd29bc5f2282680a2c64eefff0fb2c15a
diff --git a/code/filter/cmd.php b/code/filter/cmd.php index <HASH>..<HASH> 100644 --- a/code/filter/cmd.php +++ b/code/filter/cmd.php @@ -41,7 +41,7 @@ class FilterCmd extends FilterAbstract implements FilterTraversable public function sanitize($value) { $value = trim($value); - $pattern = '/[^A-Za-z0-9.\-_]*/'; + $pattern = '/[^A-Za-z0-9.,\-_]*/'; return preg_replace($pattern, '', $value); } }
Issue #<I>: Add ',' to cmd filter
timble_kodekit
train
php
b5747fa4ae0344d883874347dd67f58acc3fb5f6
diff --git a/nodeconductor/logging/elasticsearch_client.py b/nodeconductor/logging/elasticsearch_client.py index <HASH>..<HASH> 100644 --- a/nodeconductor/logging/elasticsearch_client.py +++ b/nodeconductor/logging/elasticsearch_client.py @@ -152,6 +152,10 @@ class ElasticsearchClient(object): {'terms': {key: value}} for key, value in self.must_terms_filter.items() ] + # Valid event has event_type field + self['query']['filtered']['filter']['bool'].setdefault('must', {}) + self['query']['filtered']['filter']['bool']['must']['exists'] = {'field': 'event_type'} + if self.must_not_terms_filter: self['query']['filtered']['filter']['bool']['must_not'] = [ {'terms': {key: value}} for key, value in self.must_not_terms_filter.items()
Each valid event must have event_type field (ITACLOUD-<I>)
opennode_waldur-core
train
py
21285a50f4cf9344f64a9c52c22807297faceff5
diff --git a/joomla/form/fields/user.php b/joomla/form/fields/user.php index <HASH>..<HASH> 100644 --- a/joomla/form/fields/user.php +++ b/joomla/form/fields/user.php @@ -83,10 +83,12 @@ class JFormFieldUser extends JFormField // Create the user select button. $html[] = '<div class="button2-left">'; $html[] = ' <div class="blank">'; - $html[] = ' <a class="modal_'.$this->id.'" title="'.JText::_('JLIB_FORM_CHANGE_USER').'"' . - ' href="'.($this->element['readonly'] ? '' : $link).'"' . + if ($this->element['readonly'] != 'true') { + $html[] = ' <a class="modal_'.$this->id.'" title="'.JText::_('JLIB_FORM_CHANGE_USER').'"' . + ' href="'.$link.'"' . ' rel="{handler: \'iframe\', size: {x: 800, y: 500}}">'; - $html[] = ' '.JText::_('JLIB_FORM_CHANGE_USER').'</a>'; + $html[] = ' '.JText::_('JLIB_FORM_CHANGE_USER').'</a>'; + } $html[] = ' </div>'; $html[] = '</div>';
Fixed issue [#<I>] Userfield shows button even when "readonly" (Thomas Hunziker, Michael Babker). --HG-- extra : convert_revision : svn%3A6f6e1ebd-4c2b-<I>-<I>f-f<I>bde<I>bce9/development/trunk/libraries%<I>
joomla_joomla-framework
train
php
4a713539a27fed9594c844d5fc97cc815fa503c6
diff --git a/src/shared/scripts/Viewport.js b/src/shared/scripts/Viewport.js index <HASH>..<HASH> 100644 --- a/src/shared/scripts/Viewport.js +++ b/src/shared/scripts/Viewport.js @@ -115,8 +115,8 @@ } } - window.addEventListener(ch.onscroll, viewportScroll, false); - window.addEventListener(ch.onresize, viewportResize, false); + tiny.on(window, ch.onscroll, viewportScroll, false); + tiny.on(window, ch.onresize, viewportResize, false); }; /** diff --git a/src/ui/scripts/Zoom.js b/src/ui/scripts/Zoom.js index <HASH>..<HASH> 100644 --- a/src/ui/scripts/Zoom.js +++ b/src/ui/scripts/Zoom.js @@ -519,7 +519,7 @@ } images.forEach(function (image) { - image.addEventListener('load', function onImgLoad() { + tiny.on(image, 'load', function onImgLoad() { var len = images.length; window.setTimeout(function () {
Use `tiny.on` instead of `addEventListener` in Viewport and Zoom. Resolve #<I>
mercadolibre_chico
train
js,js
132ea97483441edf03a16f797b026052da9a379c
diff --git a/intern/remote/boss/tests/int_test_permission_v0_7.py b/intern/remote/boss/tests/int_test_permission_v0_7.py index <HASH>..<HASH> 100644 --- a/intern/remote/boss/tests/int_test_permission_v0_7.py +++ b/intern/remote/boss/tests/int_test_permission_v0_7.py @@ -58,7 +58,7 @@ class ProjectPermissionTest_v0_7(unittest.TestCase): cls.exp = ExperimentResource( 'perm_test_exp', cls.coll.name, cls.coord.name, 'my experiment', 1, - 'iso', 0) + 'iso', 1) cls.chan = ChannelResource( 'perm_test_ch', cls.coll.name, cls.exp.name, 'image', 'test channel',
fixed minor bug in permission test after API update
jhuapl-boss_intern
train
py
1d828a15c8a6afd6d7dc990f162736d3d94ae11d
diff --git a/test/OptiPng.js b/test/OptiPng.js index <HASH>..<HASH> 100644 --- a/test/OptiPng.js +++ b/test/OptiPng.js @@ -15,9 +15,9 @@ describe('OptiPng', () => { 'when piped through', new OptiPng(['-o7']), 'to yield output satisfying', - resultPngBuffer => { + expect.it(resultPngBuffer => { expect(resultPngBuffer.length, 'to be within', 0, 152); - } + }) )); it('should not emit data events while paused', done => {
Wrap to satisfy function in expect.it
papandreou_node-optipng
train
js
9f4fde775383e31f98a2a54a8fbd436869ad5a8d
diff --git a/lib/riif/rails/template_handler.rb b/lib/riif/rails/template_handler.rb index <HASH>..<HASH> 100644 --- a/lib/riif/rails/template_handler.rb +++ b/lib/riif/rails/template_handler.rb @@ -4,11 +4,13 @@ module Riif cattr_accessor :default_format self.default_format = Mime[:iif] - def self.call(template) + def self.call(template, source = nil) + source ||= template.source + <<-RUBY iif = ::Riif::IIF.new - #{template.source} + #{source} iif.output RUBY
Fixes #<I> - Adds Rails 6 support to template handler Rails 6 passes source as a second parameter to the template handler - so allow that, while falling back to `template.source`
linjunpop_riif
train
rb
da2a0bbfdd3edf94123f8f177f03f174d50c5e1b
diff --git a/src/Rocketeer/Console/Commands/AbstractCommand.php b/src/Rocketeer/Console/Commands/AbstractCommand.php index <HASH>..<HASH> 100644 --- a/src/Rocketeer/Console/Commands/AbstractCommand.php +++ b/src/Rocketeer/Console/Commands/AbstractCommand.php @@ -17,6 +17,8 @@ use Rocketeer\Console\Style\RocketeerStyle; use Rocketeer\Interfaces\IdentifierInterface; use Rocketeer\Tasks\AbstractTask; use Rocketeer\Tasks\Closure; +use Rocketeer\Tasks\Plugins\Installer; +use Rocketeer\Tasks\Plugins\Updater; use Rocketeer\Traits\ContainerAwareTrait; use Rocketeer\Traits\Properties\HasEventsTrait; use Symfony\Component\Console\Command\Command; @@ -367,5 +369,11 @@ abstract class AbstractCommand extends Command implements IdentifierInterface, C if ($connections = $this->command->option('on')) { $this->connections->setActiveConnections($connections); } + + // Setup plugins if not setup already + $vendor = $this->paths->getRocketeerPath().DS.'vendor'; + if (!$this->files->has($vendor)) { + $this->queue->execute(Installer::class); + } } }
Setup plugins if not present before deploying
rocketeers_rocketeer
train
php
2b92450730fae6d007e10f98638c026671d0064d
diff --git a/Command/WatchCommand.php b/Command/WatchCommand.php index <HASH>..<HASH> 100644 --- a/Command/WatchCommand.php +++ b/Command/WatchCommand.php @@ -80,7 +80,7 @@ class WatchCommand extends AbstractCommand $error = $msg; } } - + clearstatcache (); sleep($input->getOption('period')); } }
Clear PHP file stat cache on each watch iteration
symfony_assetic-bundle
train
php
d10267f868bf1cdf4cd9484e40ebe126b53d6c65
diff --git a/templates/module/modularity-mod-slider.php b/templates/module/modularity-mod-slider.php index <HASH>..<HASH> 100644 --- a/templates/module/modularity-mod-slider.php +++ b/templates/module/modularity-mod-slider.php @@ -41,11 +41,12 @@ if (get_field('slides_autoslide', $module->ID) === true) { } } -if (count($slides) == 1) { +if (count($slides) == 1 || count($slides) == get_field('slide_columns', $module->ID)) { $flickity = array_merge($flickity, array( 'draggable' => false, 'pageDots' => false, - 'prevNextButtons' => false + 'prevNextButtons' => false, + 'autoPlay' => false )); }
Dont initialize slider if column count is same as slide count
helsingborg-stad_Modularity
train
php
789db2066a57af7bb7c17d9680278921af0bd623
diff --git a/simple.go b/simple.go index <HASH>..<HASH> 100644 --- a/simple.go +++ b/simple.go @@ -158,8 +158,8 @@ func (s *Simple) fetch(key string, ltv *lockingTimedValue) { staleDuration = s.config.BadStaleDuration expiryDuration = s.config.BadExpiryDuration - // NOTE: new error always replaces old error - if ltv.tv.Err != nil { + // NOTE: new error overwrites previous error, and also used when initial value + if ltv.tv == nil || ltv.tv.Err != nil { ltv.tv = newTimedValue(value, err, staleDuration, expiryDuration) return }
no longer panics when initial fetch results in an error
karrick_goswarm
train
go
88ba3f4f0867dd5329224f8d118085fde8833941
diff --git a/ansible_runner/display_callback/events.py b/ansible_runner/display_callback/events.py index <HASH>..<HASH> 100644 --- a/ansible_runner/display_callback/events.py +++ b/ansible_runner/display_callback/events.py @@ -42,7 +42,10 @@ class AnsibleJSONEncoderLocal(json.JSONEncoder): def default(self, o): if getattr(o, 'yaml_tag', None) == '!vault': - return o.data + encrypted_form = o._ciphertext + if isinstance(encrypted_form, bytes): + encrypted_form = encrypted_form.decode('utf-8') + return {'__ansible_vault': encrypted_form} elif isinstance(o, (datetime.date, datetime.datetime)): return o.isoformat() return super(AnsibleJSONEncoderLocal, self).default(o)
Alter encoder to share structure with Ansible core
ansible_ansible-runner
train
py
304c3cade4409d2dd42c57070b5ac4aa9f620732
diff --git a/python/ray/tune/trial.py b/python/ray/tune/trial.py index <HASH>..<HASH> 100644 --- a/python/ray/tune/trial.py +++ b/python/ray/tune/trial.py @@ -122,9 +122,15 @@ class Trial(object): try: if self.agent: - self.agent.stop.remote() - self.agent.__ray_terminate__.remote( - self.agent._ray_actor_id.id()) + stop_tasks = [] + stop_tasks.append(self.agent.stop.remote()) + stop_tasks.append(self.agent.__ray_terminate__.remote( + self.agent._ray_actor_id.id())) + _, unfinished = ray.wait( + stop_tasks, num_returns=2, timeout=10000) + if unfinished: + print(("Stopping %s Actor was unsuccessful, " + "but moving on...") % self) except Exception: print("Error stopping agent:", traceback.format_exc()) self.status = Trial.ERROR
[tune] <I> second timeout for stopping (#<I>) * <I> second timeout for stopping * prints for travis * lint * try better returning mechanism * lint
ray-project_ray
train
py
6c3206cc114e9da273b9267f663ff1b9fed4641c
diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php index <HASH>..<HASH> 100644 --- a/scripts/update/Updater.php +++ b/scripts/update/Updater.php @@ -424,9 +424,9 @@ class Updater extends \common_ext_ExtensionUpdater $this->setVersion('19.10.0'); } - $this->skip('19.10.0', '20.4.4'); + $this->skip('19.10.0', '20.4.5'); - if ($this->isVersion('20.4.4')) { + if ($this->isVersion('20.4.5')) { $assetService = $this->getServiceManager()->get(AssetService::SERVICE_ID); $taoQtiItemNpmDist = $assetService->getJsBaseWww('taoQtiItem') . 'node_modules/@oat-sa/tao-item-runner-qti/dist/'; $clientLibRegistry = ClientLibRegistry::getRegistry();
Inject version of backport #<I>
oat-sa_extension-tao-itemqti
train
php
b74dc06e0d7024708dffe22164d2b7893b8b0818
diff --git a/bosh_aws_bootstrap/lib/bosh_aws_bootstrap/route53.rb b/bosh_aws_bootstrap/lib/bosh_aws_bootstrap/route53.rb index <HASH>..<HASH> 100644 --- a/bosh_aws_bootstrap/lib/bosh_aws_bootstrap/route53.rb +++ b/bosh_aws_bootstrap/lib/bosh_aws_bootstrap/route53.rb @@ -85,7 +85,8 @@ module Bosh def get_zone_id(name) zones_response = aws_route53.client.list_hosted_zones zone = zones_response.data[:hosted_zones].find { |zone| zone[:name] == name } - zone[:id] + raise "Zone not found for #{name} in route53 zones response #{zones_response.inspect}" if zone.nil? + zone.fetch(:id) end def aws_route53
Add check for bosh_aws_bootstrap
cloudfoundry_bosh
train
rb
9e09517dd09c18752ea0c6c64b4fdd9b2d1a6cc9
diff --git a/test/angular/unit/controllers/app.test.js b/test/angular/unit/controllers/app.test.js index <HASH>..<HASH> 100644 --- a/test/angular/unit/controllers/app.test.js +++ b/test/angular/unit/controllers/app.test.js @@ -1,6 +1,6 @@ 'use strict'; -describe.only('Controller: AppCtrl', function(){ +describe('Controller: AppCtrl', function(){ var appCtrl, scope, $rootScope, ngProgressFactory, ngProgress, sandbox; beforeEach(function(){
Removed describe.only call in app.test.js (woops)
SC5_sc5-styleguide
train
js
7e07e1d5f3456fda193eb56b0fc276daef16a3a8
diff --git a/src/lux.js b/src/lux.js index <HASH>..<HASH> 100644 --- a/src/lux.js +++ b/src/lux.js @@ -14,7 +14,7 @@ lodash || require( "lodash" ) ); }; } else { - throw new Error( "Sorry - luxJS only support AMD or CommonJS module environments." ); + root.lux = factory( root.React, root.postal, root.machina, root._ ); } }( this, function( React, postal, machina, _ ) {
Adding support for plain browser global usage.
LeanKit-Labs_lux.js
train
js
cab3162dd27946e3ecf1da17e5c4494aa81a9061
diff --git a/py/selenium/webdriver/common/action_chains.py b/py/selenium/webdriver/common/action_chains.py index <HASH>..<HASH> 100755 --- a/py/selenium/webdriver/common/action_chains.py +++ b/py/selenium/webdriver/common/action_chains.py @@ -165,7 +165,7 @@ class ActionChains(object): Example, pressing ctrl+c:: - ActionsChains(driver).key_down(Keys.CONTROL).send_keys('c').key_up(Keys.CONTROL).perform() + ActionChains(driver).key_down(Keys.CONTROL).send_keys('c').key_up(Keys.CONTROL).perform() """ if element: self.click(element) @@ -185,7 +185,7 @@ class ActionChains(object): Example, pressing ctrl+c:: - ActionsChains(driver).key_down(Keys.CONTROL).send_keys('c').key_up(Keys.CONTROL).perform() + ActionChains(driver).key_down(Keys.CONTROL).send_keys('c').key_up(Keys.CONTROL).perform() """ if element: self.click(element)
Fixing typos in ActionChains method doc strings.
SeleniumHQ_selenium
train
py
cdbe37f3d2b97b42e6ff0cb22b20cc33aaaf5a90
diff --git a/classes/ModelsRepositoryTrait.php b/classes/ModelsRepositoryTrait.php index <HASH>..<HASH> 100644 --- a/classes/ModelsRepositoryTrait.php +++ b/classes/ModelsRepositoryTrait.php @@ -185,7 +185,7 @@ trait ModelsRepositoryTrait $app->locks->acquire($lockKey); } try { - $modelData = $model->toJSON(); // toJSON is used because toArray does not encode the binary data. + $modelData = $model->toJSON(['ignoreReadonlyProperties' => true]); // toJSON is used because toArray does not encode the binary data. if (method_exists($model, '__modelSleep')) { $modelData = json_encode($model->__modelSleep(json_decode($modelData, true))); }
Exclude model's readonly properties from the saved value.
bearframework_models-addon
train
php
97a9c9a0daf59c46a5f2e4331460e370f6449f7f
diff --git a/client.go b/client.go index <HASH>..<HASH> 100644 --- a/client.go +++ b/client.go @@ -37,7 +37,7 @@ type Client struct { repositoryListener RepositoryListener ready chan bool onReady chan bool - closed chan bool + closed chan struct{} count chan metric sent chan MetricsData registered chan ClientData @@ -91,6 +91,7 @@ func NewClient(options ...ConfigOption) (*Client, error) { count: make(chan metric), sent: make(chan MetricsData), registered: make(chan ClientData, 1), + closed: make(chan struct{}), } for _, opt := range options { @@ -263,7 +264,7 @@ func (uc Client) IsEnabled(feature string, options ...FeatureOption) (enabled bo func (uc *Client) Close() error { uc.repository.Close() uc.metrics.Close() - uc.closed <- true + close(uc.closed) return nil } diff --git a/spec_test.go b/spec_test.go index <HASH>..<HASH> 100644 --- a/spec_test.go +++ b/spec_test.go @@ -70,6 +70,7 @@ func (td TestDefinition) Run(t *testing.T) { client, err := td.Mock() assert.NoError(t, err) t.Run(test.Description, test.RunWithClient(client)) + client.Close() td.Unmock() } }
client: Initialize closed channel Also change channel type to struct{} as it's used for signaling only. Call Client.Close in client specification test.
Unleash_unleash-client-go
train
go,go
8c265a7719ecf8f40c3ba34644ef029d90579c90
diff --git a/lib/reterm/components/scrolling_area.rb b/lib/reterm/components/scrolling_area.rb index <HASH>..<HASH> 100644 --- a/lib/reterm/components/scrolling_area.rb +++ b/lib/reterm/components/scrolling_area.rb @@ -4,6 +4,8 @@ module RETerm class ScrollingArea < Component include CDKComponent + attr_accessor :title, :lines + # Initialize the ScrollingArea component # # @param [Hash] args scrolling area params
Accessors for ScrollingArea attributes
movitto_reterm
train
rb
be360105ecff14f67ddef1e235f07504d0da795f
diff --git a/lib/index.js b/lib/index.js index <HASH>..<HASH> 100644 --- a/lib/index.js +++ b/lib/index.js @@ -18,8 +18,4 @@ var Treasure = require('./treasure.js'); // Load all cached clients require('./loadClients')(Treasure); -if (typeof global.window.define === 'function' && global.window.define.amd) { - global.window.define('Treasure', function () { return Treasure; }); -} else { - global.window.Treasure = Treasure; -} +global.window.Treasure = Treasure;
fix(export): ADM support is broken and unused
treasure-data_td-js-sdk
train
js
7056a9091423d1465968d21498b18de75ba7c6c6
diff --git a/tests/pipeline/test_engine.py b/tests/pipeline/test_engine.py index <HASH>..<HASH> 100644 --- a/tests/pipeline/test_engine.py +++ b/tests/pipeline/test_engine.py @@ -1552,7 +1552,8 @@ class MaximumRegressionTest(WithSeededRandomPipelineEngine, # The maximum computed by pipeline should match the maximum computed by # doing a groupby in pandas. - groupby_max = result.groupby(level=0).max() - pipeline_max = result[result.maximum].reset_index(level=1, drop=True) + groupby_max = result.groupby(level=0).factor.max() + pipeline_max = (result.factor[result.maximum] + .reset_index(level=1, drop=True)) assert_equal(groupby_max, pipeline_max)
TEST: Clean up test. Don't compute max() of a boolean column; just compare the floats.
quantopian_zipline
train
py
ac6c89c5b06576f48b0ebe7ebb755eb07af82e99
diff --git a/course/edit.php b/course/edit.php index <HASH>..<HASH> 100644 --- a/course/edit.php +++ b/course/edit.php @@ -53,6 +53,11 @@ $form->timemodified = time(); if (!empty($course)) { + // Test for and remove blocks which aren't appropriate anymore + $form->blockinfo = $course->blockinfo; + block_remove_inappropriate_from_course($form); + + // Update with the new data if (update_record("course", $form)) { add_to_log($course->id, "course", "update", "edit.php?id=$id", ""); fix_course_sortorder();
Fix for bug <I>: When a course's format is changed, blocks which are not appropriate for the new format are automatically purged.
moodle_moodle
train
php
7abbc71a72d54e50e46ddfce60e4e567870e931a
diff --git a/querybuilder/query.py b/querybuilder/query.py index <HASH>..<HASH> 100644 --- a/querybuilder/query.py +++ b/querybuilder/query.py @@ -837,7 +837,7 @@ class Query(object): # build each part of the query sql = '' - # sql += self.build_withs() + sql += self.build_withs() sql += self.build_select_fields() sql += self.build_from_table() sql += self.build_joins() @@ -920,6 +920,12 @@ class Query(object): field_identifiers += join_item.right_table.get_field_identifiers() return field_identifiers + def build_withs(self): + withs = [] + if len(withs): + return 'WITH {0} '.format(', '.join(withs)) + return '' + def build_select_fields(self): """ Generates the sql for the SELECT portion of the query @@ -952,7 +958,7 @@ class Query(object): for table in self.tables: sql = table.get_sql() if len(sql): - table_parts.append(table.get_sql()) + table_parts.append(sql) # combine all table sql separated by a comma sql = 'FROM {0} '.format(', '.join(table_parts))
* Added in support for with clauses
ambitioninc_django-query-builder
train
py
8a20a485874f3ede0f788e5faf406c2bacc3760c
diff --git a/test/GitFakeFs.js b/test/GitFakeFs.js index <HASH>..<HASH> 100644 --- a/test/GitFakeFs.js +++ b/test/GitFakeFs.js @@ -236,9 +236,7 @@ describe('GitFakeFs', function () { done(); })); }); - }); - describe('#readdir()', function () { it('should not include fileStagedForDeletion.txt in the listing of the root directory', function (done) { gitFakeFs.readdir('/', passError(done, function (contents) { expect(contents, 'not to contain', 'fileStagedForDeletion.txt');
GitFakeFs test: Removed redundant describe block.
papandreou_node-gitfakefs
train
js
013bd8f28a19ac6c3570213429305cdb47f83047
diff --git a/graphdb/src/test/java/com/tinkerpop/blueprints/impls/orient/OrientGraphMultithreadRemoteTest.java b/graphdb/src/test/java/com/tinkerpop/blueprints/impls/orient/OrientGraphMultithreadRemoteTest.java index <HASH>..<HASH> 100755 --- a/graphdb/src/test/java/com/tinkerpop/blueprints/impls/orient/OrientGraphMultithreadRemoteTest.java +++ b/graphdb/src/test/java/com/tinkerpop/blueprints/impls/orient/OrientGraphMultithreadRemoteTest.java @@ -83,7 +83,6 @@ public class OrientGraphMultithreadRemoteTest { } @Test - @Ignore public void testThreadingInsert() throws InterruptedException { List<Thread> threads = new ArrayList<Thread>(); int threadCount = 8;
re-enable graph test that was creating some issues on network, now should go seemless
orientechnologies_orientdb
train
java
3064d38dfcb8109481c634a625d19ede9498b949
diff --git a/Scripts/GenHooks.php b/Scripts/GenHooks.php index <HASH>..<HASH> 100644 --- a/Scripts/GenHooks.php +++ b/Scripts/GenHooks.php @@ -1,8 +1,6 @@ <?php -require_once( '/home/cyberpower678/Peachy/Init.php' ); - -$pgIP = '/home/cyberpower678/Peachy/'; +require_once( dirname( dirname(__FILE__) ) . '/Init.php' ); $x = Peachy::newWiki( "compwhizii" );
Fix include path in GenHooks Fixes #<I>
MW-Peachy_Peachy
train
php
93d3fc8996f4db68b109b8549e81289251ef285a
diff --git a/src/main/java/org/openqa/selenium/SearchContext.java b/src/main/java/org/openqa/selenium/SearchContext.java index <HASH>..<HASH> 100644 --- a/src/main/java/org/openqa/selenium/SearchContext.java +++ b/src/main/java/org/openqa/selenium/SearchContext.java @@ -1,6 +1,5 @@ /* Copyright 2007-2009 WebDriver committers -Copyright 2007-2009 Google Inc. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
SimonStewart: After a code grant, the code is copyright the SFC and the selenium committers. Starting to update the copyright headers r<I>
appium_java-client
train
java
e03f56912abe954a14330ed9eb2eb5545fba50ae
diff --git a/wpull/version.py b/wpull/version.py index <HASH>..<HASH> 100644 --- a/wpull/version.py +++ b/wpull/version.py @@ -1,2 +1,2 @@ # encoding=utf-8 -__version__ = '0.8a1' +__version__ = '0.9a1'
Bumps version to <I>a1.
ArchiveTeam_wpull
train
py
d620a9904d5564e3a9224245971da68fdab0567a
diff --git a/anharmonic/phonon3/conductivity_RTA.py b/anharmonic/phonon3/conductivity_RTA.py index <HASH>..<HASH> 100644 --- a/anharmonic/phonon3/conductivity_RTA.py +++ b/anharmonic/phonon3/conductivity_RTA.py @@ -85,7 +85,7 @@ def _write_gamma(br, interaction, i, filename=None): mesh, frequency=frequencies, group_velocity=group_velocities[i], - heat_capacity=mode_heat_capacities[i], + heat_capacity=mode_heat_capacities[:, i], kappa=None, gamma=gamma[j, :, i], gamma_isotope=gamma_isotope_at_sigma,
Fix writting cv of gamma
atztogo_phonopy
train
py
3e02314d5c7734a465a3273d14242fe167fbc8b0
diff --git a/molo/core/tests/test_models.py b/molo/core/tests/test_models.py index <HASH>..<HASH> 100644 --- a/molo/core/tests/test_models.py +++ b/molo/core/tests/test_models.py @@ -470,3 +470,23 @@ class TestModels(TestCase, MoloTestCaseMixin): ValidationError, "The article cannot be demoted before it has been promoted." ) + + def test_is_topic_of_the_day(self): + promote_date = timezone.now() + timedelta(days=-1) + demote_date = timezone.now() + timedelta(days=1) + article_1 = ArticlePage( + title="New article", + feature_as_topic_of_the_day=True, + promote_date=promote_date, + demote_date=demote_date + ) + self.assertTrue(article_1.is_current_topic_of_the_day()) + + promote_date = timezone.now() + timedelta(days=2) + demote_date = timezone.now() + timedelta(days=4) + article_2 = ArticlePage( + title="New article", + promote_date=promote_date, + demote_date=demote_date + ) + self.assertFalse(article_2.is_current_topic_of_the_day())
Added is_topic_of_the_day test
praekeltfoundation_molo
train
py
d00919d78ae767d0844f8b1a9e7aee595bbef219
diff --git a/tests/unit/FirebaseAuth.spec.js b/tests/unit/FirebaseAuth.spec.js index <HASH>..<HASH> 100644 --- a/tests/unit/FirebaseAuth.spec.js +++ b/tests/unit/FirebaseAuth.spec.js @@ -275,7 +275,7 @@ describe('FirebaseAuth',function(){ }); }); - describe('.$waitForAuth()',function(){ + describe('$waitForAuth()',function(){ it('will be resolved with authData if user is logged in', function(){ wrapPromise(auth.$waitForAuth()); callback('onAuth')({provider:'facebook'});
auth-tests: minor style changes.
firebase_angularfire
train
js
fb8ff50451098aed145074bcca757b98ef3a7089
diff --git a/model/ArrayList.php b/model/ArrayList.php index <HASH>..<HASH> 100644 --- a/model/ArrayList.php +++ b/model/ArrayList.php @@ -155,7 +155,7 @@ class ArrayList extends ViewableData implements SS_List { return end($this->items); } - public function map($keyfield, $titlefield) { + public function map($keyfield = 'ID', $titlefield = 'Title') { $map = array(); foreach ($this->items as $item) { $map[$this->extractValue($item, $keyfield)] = $this->extractValue($item, $titlefield); diff --git a/model/List.php b/model/List.php index <HASH>..<HASH> 100644 --- a/model/List.php +++ b/model/List.php @@ -67,7 +67,7 @@ interface SS_List extends ArrayAccess, Countable, IteratorAggregate { * @param string $titlefield * @return array */ - public function map($keyfield, $titlefield); + public function map($keyfield = 'ID', $titlefield = 'Title'); /** * Returns the first item in the list where the key field is equal to the @@ -85,7 +85,7 @@ interface SS_List extends ArrayAccess, Countable, IteratorAggregate { * @param string $field * @return array */ - public function column($field); + public function column($colName = "ID"); /** * Returns TRUE if the list can be sorted by a field.
API CHANGE Childclasses to SS_List matches the same signature on abstract methods column and map. This was failing under php <I>
silverstripe_silverstripe-framework
train
php,php
a0e2d502325e714bdb8cb3972bfbfe1225ec5ff6
diff --git a/cumulusci/salesforce_api/utils.py b/cumulusci/salesforce_api/utils.py index <HASH>..<HASH> 100644 --- a/cumulusci/salesforce_api/utils.py +++ b/cumulusci/salesforce_api/utils.py @@ -19,13 +19,13 @@ def get_simple_salesforce_connection( adapter = HTTPAdapter(max_retries=retries) instance = org_config.instance_url - # Attepmt to get the host and port from the URL + # Attempt to get the host and port from the URL instance_url = urlparse(org_config.instance_url) instance = instance_url.hostname port = instance_url.port if port: - instance = instance.replace(".com", ".com:" + str(port)) + instance = f"{instance}:{port}" sf = simple_salesforce.Salesforce( instance=instance,
avoid messing up the hostname if there's one with .com not at the end
SFDO-Tooling_CumulusCI
train
py
fbb8d0f5d78611a39804393f433d3a1b72973498
diff --git a/chef/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb b/chef/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb index <HASH>..<HASH> 100644 --- a/chef/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb +++ b/chef/spec/unit/mixin/enforce_ownership_and_permissions_spec.rb @@ -24,7 +24,7 @@ describe Chef::Mixin::EnforceOwnershipAndPermissions do @node = Chef::Node.new @node.name "make_believe" @run_context = Chef::RunContext.new(@node, {}) - @resource = Chef::Resource::File.new("/tmp/madeup.txt") + @resource = Chef::Resource::File.new("#{Dir.tmpdir}/madeup.txt") @provider = Chef::Provider::File.new(@resource, @run_context) end
use platform independent Dir.tmpdir to reference tmp directory
chef_chef
train
rb
9c2eee30ae272c2af32e5f200d0ffd1a06af3801
diff --git a/lib/jitsu/commands.js b/lib/jitsu/commands.js index <HASH>..<HASH> 100644 --- a/lib/jitsu/commands.js +++ b/lib/jitsu/commands.js @@ -38,6 +38,11 @@ jitsu.use(require('flatiron-cli-users'), { } }); } + }, + logout: function(details, next){ + jitsu.config.clear('api-token'); + jitsu.config.save(); + return next(); } } }); \ No newline at end of file
[api] removes 'api-token' on logout
nodejitsu_jitsu
train
js
2412c8ca0e0d2c2cf430e11c3288c8715298b1a9
diff --git a/system/Validation/Validation.php b/system/Validation/Validation.php index <HASH>..<HASH> 100644 --- a/system/Validation/Validation.php +++ b/system/Validation/Validation.php @@ -646,9 +646,9 @@ class Validation implements ValidationInterface // passed along from a redirect_with_input request. if (empty($this->errors) && ! is_cli()) { - if (isset($_SESSION) && $errors = session('_ci_validation_errors')) + if (isset($_SESSION, $_SESSION['_ci_validation_errors'])) { - $this->errors = unserialize($errors); + $this->errors = unserialize($_SESSION['_ci_validation_errors']); } }
Simplify Validation::getErrors() No need to use session class instance to get $_SESSION['_ci_validation_errors'] if it and $_SESSION are proven set. Using isset($var1, $var2) easier on eyes than a compound conditional part of which is an assignment.
codeigniter4_CodeIgniter4
train
php
f229eb950d95ce87c2091f8e1018bab76735a1a8
diff --git a/lib/adapters/websql.js b/lib/adapters/websql.js index <HASH>..<HASH> 100644 --- a/lib/adapters/websql.js +++ b/lib/adapters/websql.js @@ -239,7 +239,7 @@ function WebSqlPouch(opts, callback) { // initial schema var meta = 'CREATE TABLE IF NOT EXISTS ' + META_STORE + - ' (update_seq, dbid, db_version INTEGER)'; + ' (update_seq INTEGER, dbid, db_version INTEGER)'; var attach = 'CREATE TABLE IF NOT EXISTS ' + ATTACH_STORE + ' (digest, json, body BLOB)'; var doc = 'CREATE TABLE IF NOT EXISTS ' + DOC_STORE +
(#<I>) - websql: update_seq should be an INTEGER This fixes errors with the update_seq on Android 2.x using the SQLite plugin, because we need to know the type of the column in order to bind it properly.
pouchdb_pouchdb
train
js
8b9d99199ac8cea385f49cfdddbafebb6b11f78e
diff --git a/tests/test_replay.py b/tests/test_replay.py index <HASH>..<HASH> 100644 --- a/tests/test_replay.py +++ b/tests/test_replay.py @@ -10,7 +10,7 @@ import os import pytest -from cookiecutter import replay +from cookiecutter import replay, utils from cookiecutter.config import get_user_config @@ -52,6 +52,15 @@ def test_dump_type_error_if_not_dict_context(template_name): replay.dump(template_name, 'not_a_dict') [email protected] +def cleanup_replay_dir(request, replay_dir): + def remove_dir(): + if os.path.isdir(replay_dir): + utils.rmtree(replay_dir) + request.addfinalizer(remove_dir) + + [email protected]('cleanup_replay_dir') def test_raise_if_replay_dir_creation_fails( mocker, template_name, context, replay_dir): mock_ensure = mocker.patch( @@ -64,6 +73,7 @@ def test_raise_if_replay_dir_creation_fails( mock_ensure.assert_called_once_with(replay_dir) [email protected]('cleanup_replay_dir') def test_run_json_dump( mocker, template_name, context, replay_dir): spy_ensure = mocker.spy(
Use a fixture to clean up the replay dir
audreyr_cookiecutter
train
py
9b1a1e22c797efa0609ca15a088b0e5908273205
diff --git a/spyder/widgets/panels/manager.py b/spyder/widgets/panels/manager.py index <HASH>..<HASH> 100644 --- a/spyder/widgets/panels/manager.py +++ b/spyder/widgets/panels/manager.py @@ -45,7 +45,7 @@ class PanelsManager(Manager): editor.document().blockCountChanged.connect( self._update_viewport_margins) - def append(self, panel, position=Panel.Position.LEFT): + def register(self, panel, position=Panel.Position.LEFT): """ Installs a panel on the editor. diff --git a/spyder/widgets/sourcecode/codeeditor.py b/spyder/widgets/sourcecode/codeeditor.py index <HASH>..<HASH> 100644 --- a/spyder/widgets/sourcecode/codeeditor.py +++ b/spyder/widgets/sourcecode/codeeditor.py @@ -340,7 +340,7 @@ class CodeEditor(TextEditBaseWidget): self.blanks_enabled = False # Line number area management - self.linenumberarea = self.panels.append(LineNumberArea(self)) + self.linenumberarea = self.panels.register(LineNumberArea(self)) self.updateRequest.connect(self.linenumberarea.update_) # Colors to be defined in _apply_highlighter_color_scheme()
Change append manager panels method name for register
spyder-ide_spyder
train
py,py
c6502f514253bb412615a000da5394734b7fe4db
diff --git a/src/TypeaheadInput.react.js b/src/TypeaheadInput.react.js index <HASH>..<HASH> 100644 --- a/src/TypeaheadInput.react.js +++ b/src/TypeaheadInput.react.js @@ -49,8 +49,8 @@ class TypeaheadInput extends React.Component { <div className={cx('rbt-input-container', 'clearfix', 'form-control', { 'focus': isFocused, - 'input-lg': bsSize === 'large' || bsSize === 'lg', - 'input-sm': bsSize === 'small' || bsSize === 'sm', + 'input-lg form-control-lg': bsSize === 'large' || bsSize === 'lg', + 'input-sm form-control-sm': bsSize === 'small' || bsSize === 'sm', })} disabled={disabled} onClick={onInputFocus}
Support BS4 form-control sizing
ericgio_react-bootstrap-typeahead
train
js
beddf10f1f09c2457514755bfcc7ea9cb2647f0a
diff --git a/fontbakery-check-ttf.py b/fontbakery-check-ttf.py index <HASH>..<HASH> 100755 --- a/fontbakery-check-ttf.py +++ b/fontbakery-check-ttf.py @@ -2003,7 +2003,7 @@ def main(): # ---------------------------------------------------- def version_is_newer(a, b): a = map(int, a.split(".")) - # b = map(int, b.split(".")) + b = map(int, b.split(".")) return a > b def get_version_from_name_entry(name): @@ -2038,7 +2038,12 @@ def main(): # in an external "for font" loop # DC yes we should check this and warn about it but it is not fatal. failed = False - expected = get_expected_version(font) + try: + expected = get_expected_version(font) + except: + expected = None + fb.error("failed to parse font version entries in the name table.") + if expected is None: failed = True fb.error("Could not find any font versioning info on the head table"
detect and report bad parsing of font version entries in the name tables (issue #<I>)
googlefonts_fontbakery
train
py
3d41b7cef5f103f8b2d8aeeca8cb2b048dee6175
diff --git a/subsystem-test/src/main/java/org/jboss/as/subsystem/test/ModelDescriptionValidator.java b/subsystem-test/src/main/java/org/jboss/as/subsystem/test/ModelDescriptionValidator.java index <HASH>..<HASH> 100644 --- a/subsystem-test/src/main/java/org/jboss/as/subsystem/test/ModelDescriptionValidator.java +++ b/subsystem-test/src/main/java/org/jboss/as/subsystem/test/ModelDescriptionValidator.java @@ -181,7 +181,9 @@ public class ModelDescriptionValidator { errors.add(new ValidationFailure(error, address)); } } else { - errors.add(new ValidationFailure("Empty key '" + key + "'", address)); + if (!key.equals(OPERATIONS) && !key.equals(CHILDREN)) { + errors.add(new ValidationFailure("Empty key '" + key + "'", address)); + } } } @@ -251,7 +253,9 @@ public class ModelDescriptionValidator { errors.add(new ValidationFailure(error, address)); } } else { - errors.add(new ValidationFailure("Empty key '" + key + "' found for child type '" + type + "'", address)); + if (!key.equals(MODEL_DESCRIPTION)) { + errors.add(new ValidationFailure("Empty key '" + key + "' found for child type '" + type + "'", address)); + } } } }
Allow undefined operations and children was: cba<I>e5c<I>f<I>f<I>cf<I>
wildfly_wildfly-core
train
java
07d3742e76f9918c51162be5f1d2f09bb4ba9b0e
diff --git a/src/main/java/eu/hansolo/tilesfx/skins/TileSkin.java b/src/main/java/eu/hansolo/tilesfx/skins/TileSkin.java index <HASH>..<HASH> 100644 --- a/src/main/java/eu/hansolo/tilesfx/skins/TileSkin.java +++ b/src/main/java/eu/hansolo/tilesfx/skins/TileSkin.java @@ -137,6 +137,7 @@ public class TileSkin extends SkinBase<Tile> implements Skin<Tile> { angleStep = angleRange / range; highlightSections = getSkinnable().isHighlightSections(); redraw(); + handleCurrentValue(getSkinnable().getCurrentValue()); } else if ("SECTION".equals(EVENT_TYPE)) { sections = getSkinnable().getSections(); }
Fixed minor issue when recalculating angle range
HanSolo_tilesfx
train
java